[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-14-gf5a2faa

[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  f5a2faada616650b930bdb8501a7f5fe79708034 (commit)
      from  95d90ebb39ba5c94e8de8eba0b158b9a20228838 (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 f5a2faada616650b930bdb8501a7f5fe79708034
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Oct 24 00:17:17 2012 +0200

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

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

Summary of changes:
 .../armadeus/apf9328/apf9328-u-boot-2012.10.h      |    7 ++---
 patches/u-boot/2012.10/103-apf9328.patch           |   21 +++----------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
index 8ec08fb..d751c7d 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
@@ -23,8 +23,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"5.3"
-#define CONFIG_IDENT_STRING	" apf9328 patch 5.7"
+#define CONFIG_ENV_VERSION	"5.4"
+#define CONFIG_IDENT_STRING	" apf9328 patch 5.8"
 #define CONFIG_BOARD_NAME	apf9328
 
 /*
@@ -180,7 +180,6 @@
  */
 #define	CONFIG_LOADADDR			0x08000000
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
 /*
  * Extra Environments
@@ -242,7 +241,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.bin\0"\
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
diff --git a/patches/u-boot/2012.10/103-apf9328.patch b/patches/u-boot/2012.10/103-apf9328.patch
index b2c6bee..36f302a 100644
--- a/patches/u-boot/2012.10/103-apf9328.patch
+++ b/patches/u-boot/2012.10/103-apf9328.patch
@@ -89,7 +89,7 @@ new file mode 100644
 index 0000000..280f749
 --- /dev/null
 +++ b/board/armadeus/apf9328/apf9328.c
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,93 @@
 +/*
 + * (C) Copyright 2005-2011
 + * Nicolas Colombain <nic...@ar...>
@@ -163,8 +163,10 @@ index 0000000..280f749
 +	/* 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;
@@ -178,22 +180,7 @@ index 0000000..280f749
 +#ifdef CONFIG_DRIVER_DM9000
 +int board_eth_init(bd_t *bis)
 +{
-+	struct eth_device *dev;
-+	unsigned char env_enetaddr[6];
-+
-+	if (dm9000_initialize(bis) != 0)
-+		return -1;
-+	if (!eth_getenv_enetaddr("ethaddr", env_enetaddr)) {
-+		dev = eth_get_dev_by_index(0);
-+		if (dev) {
-+			eth_setenv_enetaddr("ethaddr", dev->enetaddr);
-+		} else {
-+			printf("DM9000 APF9328: Couldn't get eth device\n");
-+			return -1;
-+		}
-+	}
-+
-+	return 0;
++	return dm9000_initialize(bis);
 +}
 +#endif
 diff --git a/board/armadeus/apf9328/apf9328fpga.c b/board/armadeus/apf9328/apf9328fpga.c


hooks/post-receive
-- 
armadeus