[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-132-g3de5577

[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  3de55774b49d1b9b57a0af5c1c7c591c7a5e3cb8 (commit)
      from  55fcd8ac4eeafe2ebc2177843e43c49daa687315 (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 3de55774b49d1b9b57a0af5c1c7c591c7a5e3cb8
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 14 11:57:49 2012 +0100

    [UBOOT] apf28: enable mmcboot and net console

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2011.12.h   |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 006da29..d0ca845 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
@@ -227,6 +227,7 @@
 #define	CONFIG_DISCOVER_PHY
 #define	CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_M28_FEC_MAC_IN_OCOTP
+#define CONFIG_NETCONSOLE		1
 #endif
 #define ACFG_OUI	0x001EAC
 
@@ -273,10 +274,10 @@
 /*
  * OCOTP
  */
-/*
-#define CONFIG_IMX_OCOTP
+
+/*#define CONFIG_IMX_OCOTP*/
 #define IMX_OCOTP_BASE	MXS_OCOTP_BASE
-*/
+
 /*
  * Boot Linux
  */
@@ -313,6 +314,8 @@
 	"rootfs_len="		MK_STR(CONFIG_ROOTFS_LEN)		"\0" \
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
 	"serverpath="		MK_STR(CONFIG_SRV_PATH)			"\0" \
+	"mmcroot=/dev/mmcblk0p1\0"					\
+	"mmcrootfstype=ext2\0"						\
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\


hooks/post-receive
-- 
armadeus