[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-9-gf8a43e3

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  f8a43e3a7b99ac62923e78f1c049c14c96f102f0 (commit)
      from  b03b8afd8142a8a2c3b3019e2f79d243e86c9c9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f8a43e3a7b99ac62923e78f1c049c14c96f102f0
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Oct 22 21:38:07 2012 +0200

    [UBOOT] 2012.10/apf27: update configuration - fix script flash_reset_env

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2012.10.h   |   12 +++----
 ...-Add-support-for-the-armadeus-apf27-board.patch |   34 +++----------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
index 14c7613..c6f570c 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"3.2"
-#define CONFIG_IDENT_STRING	" apf27 patch 3.7"
+#define CONFIG_ENV_VERSION 	"3.3"
+#define CONFIG_IDENT_STRING	" apf27 patch 3.8"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -109,8 +109,7 @@
 #define PHYS_SDRAM_1 			0xA0000000
 #define PHYS_SDRAM_2 			0xB0000000
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (512<<10) )
-#define CONFIG_SYS_GBL_DATA_SIZE	256		/* Initial data */
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (512<<10))
 #define CONFIG_SYS_MEMTEST_START	0xA0000000	/* memtest test area  */
 #define CONFIG_SYS_MEMTEST_END		0xA0300000	/* 3 MiB RAM test */
 
@@ -190,7 +189,6 @@
  */
 #define CONFIG_LOADADDR			0xA0000000
 #define	CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
 /*
  * Extra Environments
@@ -268,7 +266,7 @@
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
-	"flash_reset_env=env default -f; saveenv;"			\
+	"flash_reset_env=env default -f -a; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
@@ -286,7 +284,6 @@
  * Serial Driver
  */
 #define CONFIG_MXC_UART
-#define CONFIG_SYS_MX27_UART1
 #define CONFIG_CONS_INDEX		1
 #define CONFIG_BAUDRATE 		115200
 #define CONFIG_MXC_UART_BASE		UART1_BASE
@@ -294,6 +291,7 @@
 /*
  * GPIO
  */
+#define CONFIG_MXC_GPIO
 
 /*
  * NOR
diff --git a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
index 2414608..f6fd612 100644
--- a/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
+++ b/patches/u-boot/2012.10/302-Add-support-for-the-armadeus-apf27-board.patch
@@ -78,7 +78,7 @@ new file mode 100644
 index 0000000..c1ca6bd
 --- /dev/null
 +++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,304 @@
 +/*
 + * Copyright (C) 2007 Sascha Hauer, Pengutronix
 + * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -109,6 +109,7 @@ index 0000000..c1ca6bd
 +#include <asm/arch/imx-regs.h>
 +#include <asm/arch/gpio.h>
 +#include <asm/errno.h>
++#include <environment.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
 +
@@ -341,8 +342,10 @@ index 0000000..c1ca6bd
 +	/* detect compatibility issue of environment version */
 +	s = getenv("env_version");
 +	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
++		char * const vars[] = {"flash_reset_env"};
 +		printf("*** Warning - Environment version change suggests: "
 +			"run flash_reset_env; reset\n");
++		set_default_vars(1, vars);
 +	}
 +
 +	/* Unlock whole flash but U-Boot */
@@ -372,38 +375,13 @@ index 0000000..c1ca6bd
 +	return 0;
 +}
 +
-+int board_eth_init(bd_t *bis)
-+{
-+#define STR_ENV_ETHADDR	"ethaddr"
-+	int rc = -ENODEV;
-+
-+#if defined(CONFIG_FEC_MXC)
-+	struct eth_device *dev;
-+	uchar eth_addr[6];
-+
-+	rc = fecmxc_initialize(bis);
-+
-+	if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
-+		dev = eth_get_dev_by_index(0);
-+		if (dev) {
-+			eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
-+		} else {
-+			printf("FEC APF27: Couldn't get eth device\n");
-+			rc = -1;
-+		}
-+	}
-+#endif
-+
-+	return rc;
-+}
-+
-+/*void enable_caches(void)
++void enable_caches(void)
 +{
 +#ifndef CONFIG_SYS_DCACHE_OFF
 +	
 +	dcache_enable();
 +#endif
-+}*/
++}
 +
 diff --git a/board/armadeus/apf27/config.mk b/board/armadeus/apf27/config.mk
 new file mode 100644


hooks/post-receive
-- 
armadeus