[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-20-g8920204

[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  89202041278c6b3c7f25a1f3523a91213aaaf7c2 (commit)
      from  54c2c6d583915634fe1276ccf376b2ce24e1b3ed (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 89202041278c6b3c7f25a1f3523a91213aaaf7c2
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Oct 25 15:28:30 2012 +0200

    [UBOOT] 2012.10/apf51: update configuration - fix script flash_reset_env - no NFS support due to the boot memory constraints

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2012.10.h   |    7 ++---
 patches/u-boot/2012.10/401-apf51.patch             |   29 ++-----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
index 65a9e58..63024df 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.10.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"1.2"
-#define CONFIG_IDENT_STRING	" apf51 patch 1.7"
+#define CONFIG_ENV_VERSION	"1.3"
+#define CONFIG_IDENT_STRING	" apf51 patch 1.8"
 #define CONFIG_BOARD_NAME	apf51
 
 /*
@@ -201,7 +201,6 @@
  */
 #define CONFIG_LOADADDR			0x90000000
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
 /*
  * Extra Environments
@@ -275,7 +274,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" \
diff --git a/patches/u-boot/2012.10/401-apf51.patch b/patches/u-boot/2012.10/401-apf51.patch
index 5bf9ee5..290fc6a 100644
--- a/patches/u-boot/2012.10/401-apf51.patch
+++ b/patches/u-boot/2012.10/401-apf51.patch
@@ -67,7 +67,7 @@ new file mode 100644
 index 0000000..8ff1381
 --- /dev/null
 +++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,1222 @@
+@@ -0,0 +1,1199 @@
 +/*
 + * (C) Copyright 2010-2012 Eric Jarrige, Armadeus Project
 + *
@@ -831,31 +831,6 @@ index 0000000..8ff1381
 +#endif
 +}
 +
-+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 APF51: Couldn't get eth device\n");
-+			rc = -1;
-+		}
-+	}
-+#endif
-+
-+	return rc;
-+}
-+
 +#ifdef CONFIG_FSL_MMC
 +int esdhc_active = CONFIG_DEFAULT_MMC;
 +#define SD1_PAD_CFG		(PAD_CTL_DRV_MAX | PAD_CTL_DRV_VOT_HIGH | \
@@ -1030,8 +1005,10 @@ index 0000000..8ff1381
 +	/* 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);
 +	}
 +
 +	return 0;


hooks/post-receive
-- 
armadeus