[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-116-gc0d1b01

[Gwenhael Goavec-M. <gwe...@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  c0d1b01a67909bb68e19e2a680764fbb85ebc7ef (commit)
      from  2912e6a0dbd65dfe203822d57adaebc599536fc1 (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 c0d1b01a67909bb68e19e2a680764fbb85ebc7ef
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Fri Mar 9 18:48:08 2012 +0100

    [UBOOT] 2011.12 apf9328: Avoids message 'incorrect device type in ...' when erasing rootfs partition

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

Summary of changes:
 .../armadeus/apf9328/apf9328-u-boot-2011.12.h      |    3 ++-
 patches/u-boot/2011.12/05-apf9328-config.patch     |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
index b609887..198989f 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
@@ -49,6 +49,7 @@
 
 #define CONFIG_MISC_INIT_R
 
+#define CONFIG_NETCONSOLE 1
 /*
  * BOOTP options
  */
@@ -132,7 +133,7 @@
 	"filesize="		MK_STR(CONFIG_SYS_MONITOR_LEN)	"\0"	\
 	"console="		CONFIG_CONSOLE			"\0"	\
 	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
-	"partition=		nor0,4\0"				\
+	"partition=nor0,4\0"				\
 	"uboot_addr="		MK_STR(CONFIG_SYS_MONITOR_BASE)	"\0"	\
 	"uboot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)	"\0"	\
 	"env_addr="		MK_STR(CONFIG_ENV_ADDR)		"\0"	\
diff --git a/patches/u-boot/2011.12/05-apf9328-config.patch b/patches/u-boot/2011.12/05-apf9328-config.patch
index c34e554..1a7fb27 100644
--- a/patches/u-boot/2011.12/05-apf9328-config.patch
+++ b/patches/u-boot/2011.12/05-apf9328-config.patch
@@ -147,7 +147,7 @@ index 0000000..ef5e54a
 +	"filesize="		MK_STR(CONFIG_SYS_MONITOR_LEN)	"\0"	\
 +	"console="		CONFIG_CONSOLE			"\0"	\
 +	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
-+	"partition=		nor0,4\0"				\
++	"partition=nor0,4\0"				\
 +	"uboot_addr="		MK_STR(CONFIG_SYS_MONITOR_BASE)	"\0"	\
 +	"uboot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)	"\0"	\
 +	"env_addr="		MK_STR(CONFIG_ENV_ADDR)		"\0"	\


hooks/post-receive
-- 
armadeus