[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-271-g2ab8f09

[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  2ab8f09508789dec6790da5ae3c7a344578f819d (commit)
      from  df2707f8b739745108e3415ea5e5ec6ac4e238f9 (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 2ab8f09508789dec6790da5ae3c7a344578f819d
Author: Eric Jarrige <eri...@ar...>
Date:   Mon May 27 23:48:55 2013 +0200

    [UBOOT] 2013.04: add apf9328 config file - cleanup 2012.10 config

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

Summary of changes:
 ...8-u-boot-2012.10.h => apf9328-u-boot-2013.04.h} |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
 rename buildroot/target/device/armadeus/apf9328/{apf9328-u-boot-2012.10.h => apf9328-u-boot-2013.04.h} (98%)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
similarity index 98%
rename from buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
rename to buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
index d751c7d..98fd250 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
@@ -62,7 +62,7 @@
 #define CONFIG_BOOTP_DNS2
 
 #define CONFIG_HOSTNAME		CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH		"/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_ROOTPATH		"/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
 
 /*
  * U-Boot Commands
@@ -167,9 +167,9 @@
 */
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
-#define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS		"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
-				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+#define	CONFIG_BOOTFILE		__stringify(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS		"console=" __stringify(ACFG_CONSOLE_DEV) "," \
+				__stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
 				" root=/dev/mtdblock5 rootfstype=jffs2 "
 
 #define ACFG_CONSOLE_DEV	ttySMX0
@@ -186,14 +186,14 @@
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"env_version="		CONFIG_ENV_VERSION		"\0"	\
-	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)	"\0"	\
+	"consoledev="		__stringify(ACFG_CONSOLE_DEV)	"\0"	\
 	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
 	"partition=nor0,5\0"						\
-	"uboot_addr="		MK_STR(CONFIG_SYS_MONITOR_BASE)	"\0"	\
-	"firmware_addr="	MK_STR(CONFIG_FIRMWARE_ADDR)	"\0"	\
-	"kernel_addr="		MK_STR(CONFIG_KERNEL_ADDR)	"\0"	\
-	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_ADDR)	"\0"	\
-	"board_name="		MK_STR(CONFIG_BOARD_NAME)	"\0"	\
+	"uboot_addr="		__stringify(CONFIG_SYS_MONITOR_BASE)	"\0"	\
+	"firmware_addr="	__stringify(CONFIG_FIRMWARE_ADDR)	"\0"	\
+	"kernel_addr="		__stringify(CONFIG_KERNEL_ADDR)	"\0"	\
+	"rootfs_addr="		__stringify(CONFIG_ROOTFS_ADDR)	"\0"	\
+	"board_name="		__stringify(CONFIG_BOARD_NAME)	"\0"	\
 	"firmware_autoload=0\0"						\
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"	\


hooks/post-receive
-- 
armadeus