[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-128-g5b3ee7e

[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  5b3ee7e2148f36b0fe0e617b53cb9922182227c1 (commit)
       via  d35dfd2bbff8e3943bec6f88052763257eaf074a (commit)
      from  396badac15634e47e19abd37314e8f48bc5c698a (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 5b3ee7e2148f36b0fe0e617b53cb9922182227c1
Merge: d35dfd2 396bada
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Mar 13 17:06:33 2012 +0100

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

commit d35dfd2bbff8e3943bec6f88052763257eaf074a
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Mar 13 17:06:13 2012 +0100

    [UBOOT] Update linux nand partition parameters

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2011.12.h   |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 1e107a2..7c2afcd 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -204,11 +204,11 @@
 #define	CONFIG_LZO
 #define	CONFIG_MTD_DEVICE
 #define	CONFIG_MTD_PARTITIONS
-#define CONFIG_MTDMAP   "gpmi-nand.0"
-#define	MTDIDS_DEFAULT			"nand0=gpmi-nand.0"
+#define CONFIG_MTDMAP   "gpmi-nfc.0"
+#define	MTDIDS_DEFAULT			"nand0=" CONFIG_MTDMAP
 #define	MTDPARTS_DEFAULT			\
-	"mtdparts=gpmi-nand.0:"			\
-		"3m(bootloader)ro,"		\
+	"mtdparts=" CONFIG_MTDMAP			\
+		":3m(bootloader)ro,"		\
 		"512k(environment),"		\
 		"512k(redundant-environment),"	\
 		"8M(kernel),"			\


hooks/post-receive
-- 
armadeus