[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-19-g54c59e8

[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  54c59e87cea5d7720af7248c6e13fb5eda0517ff (commit)
      from  5b2ddaeb96e47d89f0c78012dbfe77faa93b960f (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 54c59e87cea5d7720af7248c6e13fb5eda0517ff
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Feb 1 05:28:59 2012 +0100

    [UBOOT] apf28: add console paramater ttyAM0 to kernel boot params

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2011.12.h   |   10 +++++++---
 1 files changed, 7 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 cfcdbd9..cbd0f07 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
@@ -26,8 +26,8 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"0.1"
-#define CONFIG_IDENT_STRING	" apf28 patch 0.1"
+#define CONFIG_ENV_VERSION 	"0.2"
+#define CONFIG_IDENT_STRING	" apf28 patch 0.2"
 
 /*
  * SoC configurations
@@ -285,7 +285,10 @@
 #define	CONFIG_BOOTDELAY	-1
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		"uImage"
-#define	CONFIG_BOOTARGS		"console=ttyAM0,115200n8 "
+#define CONFIG_BOOTARGS \
+	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
+
+#define CONFIG_CONSOLE "console=ttyAM0,"MK_STR(CONFIG_BAUDRATE)
 #define	CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CONFIG_SYS_AUTOLOAD	"no"
 #define	CONFIG_LOADADDR		0x40000000
@@ -296,6 +299,7 @@
  */
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"env_version=" CONFIG_ENV_VERSION "\0"				\
+	"console="		CONFIG_CONSOLE				"\0" \
 	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
 	"partition=nand0,4\0"						\
 	"uboot_offset="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0" \


hooks/post-receive
-- 
armadeus