[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-273-g8a26940

[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  8a26940559d5fa30611598c48d6587abd814d349 (commit)
      from  d0a704a0b5a82f515b9fa1788b919b05778ffece (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 8a26940559d5fa30611598c48d6587abd814d349
Author: Eric Jarrige <eri...@ar...>
Date:   Tue May 28 00:43:17 2013 +0200

    [UBOOT] 2013.04: add apf28 configuration file

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

Summary of changes:
 ...f28-u-boot-2012.10.h => apf28-u-boot-2013.04.h} |   26 ++++++++++----------
 1 files changed, 13 insertions(+), 13 deletions(-)
 copy buildroot/target/device/armadeus/apf28/{apf28-u-boot-2012.10.h => apf28-u-boot-2013.04.h} (95%)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
similarity index 95%
copy from buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
copy to buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
index 3562df1..3dcaced 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
@@ -22,8 +22,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/regs-base.h>
-
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION	"1.3"
 #define CONFIG_IDENT_STRING	" apf28 patch 1.3"
@@ -35,6 +33,8 @@
 #define	CONFIG_MX28			/* i.MX28 SoC */
 #define	CONFIG_MACH_TYPE	3845	/* APF28 */
 
+#include <asm/arch/regs-base.h>
+
 /*
  * Enable the call to miscellaneous platform dependent initialization.
  */
@@ -99,7 +99,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
@@ -205,9 +205,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 \
 			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
 #define ACFG_CONSOLE_DEV	ttyAM0
@@ -224,14 +224,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=nand0,6\0"						\
-	"u-boot_addr="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0"\
-	"u-boot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)		"\0"\
-	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0"\
-	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0"\
-	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0"\
+	"u-boot_addr="		__stringify(CONFIG_SYS_MONITOR_OFFSET)	"\0"\
+	"u-boot_len="		__stringify(CONFIG_SYS_MONITOR_LEN)		"\0"\
+	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)		"\0"\
+	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)		"\0"\
+	"board_name="		__stringify(CONFIG_BOARD_NAME)		"\0"\
 	"kernel_addr_r=40000000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
@@ -399,7 +399,7 @@
  */
 #ifdef	CONFIG_CMD_MMC
 #define	CONFIG_MMC
-#define	CONFIG_MMC_BOUNCE_BUFFER
+#define CONFIG_BOUNCE_BUFFER
 #define	CONFIG_GENERIC_MMC
 #define	CONFIG_MXS_MMC
 #endif


hooks/post-receive
-- 
armadeus