[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-257-g018bed2

[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  018bed243fa1fb6d06459c6dc3e8f3088de31b41 (commit)
       via  070b1ef28b145dc872afdb6de85a386079449880 (commit)
       via  92533c9cdea011738afd7f104bcd59ae6d2585b6 (commit)
      from  4c63cce01cadb106f32d9bc03c790a238199b859 (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 018bed243fa1fb6d06459c6dc3e8f3088de31b41
Merge: 070b1ef28b145dc872afdb6de85a386079449880 4c63cce01cadb106f32d9bc03c790a238199b859
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jan 24 23:40:10 2011 +0100

    Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 070b1ef28b145dc872afdb6de85a386079449880
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jan 24 23:39:03 2011 +0100

    [UBOOT] Check new compatibility version of environment variables

commit 92533c9cdea011738afd7f104bcd59ae6d2585b6
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Jan 24 23:32:30 2011 +0100

    [UBOOT] Fix default rootfs filename

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2010.03.h   |    6 +++---
 .../target/u-boot/u-boot-2010.03-401-apf51.patch   |    9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index c69d0fb..f694e6b 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -26,8 +26,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"0.3"
-#define CONFIG_IDENT_STRING	" apf51 patch 0.2"
+#define CONFIG_ENV_VERSION 	"0.4"
+#define CONFIG_IDENT_STRING	" apf51 patch 0.4"
 
  /* High Level Configuration Options */
 #define CONFIG_ARMV7		1	/* This is armv7 Cortex-A8 CPU	*/
@@ -211,7 +211,7 @@
 	"download_kernel=tftpboot ${loadaddr} "				\
 		" ${serverpath}${board_name}-linux.bin\0"		\
 	"download_rootfs=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-rootfs.arm.ubi\0"	\
+		" ${serverpath}${board_name}-rootfs.ubi\0"	\
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
diff --git a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
index fc84bc9..6bb476e 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
@@ -2,7 +2,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ u-boot-2010.03/board/armadeus/apf51/apf51.c	2011-01-05 18:11:15.000000000 +0100
-@@ -0,0 +1,1102 @@
+@@ -0,0 +1,1109 @@
 +/*
 + * (C) Copyright 2010 Eric Jarrige, Armadeus Project
 + *
@@ -916,6 +916,13 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
 +	APF51_init_fpga (firmware_buffer, size);
 +#endif
 +
++	/* detect compatibility issue of environment version */
++	s = getenv ("env_version");
++	if (( NULL == s ) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
++		printf("*** Warning - Environment version change suggests: "
++			"run flash_reset_env; reset\n");
++	}
++
 +	return 0;
 +}
 +


hooks/post-receive
-- 
armadeus