[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-789-gebafae4

[Julien B a. A. <ar...@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  ebafae462d155455c97de4c833c402dfc75ce1d0 (commit)
      from  c9f6dd62e1985b2ae09bd37141220823e7543853 (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 ebafae462d155455c97de4c833c402dfc75ce1d0
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jul 14 16:48:37 2015 +0200

    [U-BOOT] apf6: fixes DTB directory when booting from external MMC/SD (using Buildroot default DTB dir inside rootfs)

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

Summary of changes:
 .../device/armadeus/apf6/apf6-u-boot-2014.07.h     |   12 ++++++------
 .../device/armadeus/apf6/apf6-u-boot-2015.01.h     |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 1768023..2784a95 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -16,7 +16,7 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	7
+#define CONFIG_ENV_VERSION	8
 #define CONFIG_BOARD_NAME	apf6
 
 /* SPL */
@@ -259,7 +259,7 @@
 	"checknload_firmware=if test ${firmware_autoload} = 1;"					\
 				"then run flash_firmware; else exit; fi;\0"			\
 	"mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${board_name}-linux.bin\0" \
-	"mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdir}/dtbs/${cpu_type}-${fdt_name}.dtb\0" \
+	"mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb\0" \
 	"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"			\
 		"${gatewayip}:${netmask}:${hostname}:eth0:off\0"				\
 	"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " 				\
@@ -267,10 +267,10 @@
 	"genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; "	\
 		"run addmmcargs; "								\
 		"run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0"	\
-	"mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcroot /dev/mmcblk1p1 ro; " \
-		"run genmmcboot;\0"								\
-	"emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcroot /dev/mmcblk2p2 ro; " \
-		"run genmmcboot;\0"								\
+	"mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcdtbdir /boot;" \
+		"setenv mmcroot /dev/mmcblk1p1 ro; run genmmcboot;\0"				\
+	"emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcdtbdir /dtbs;"	\
+		"setenv mmcroot /dev/mmcblk2p2 ro; run genmmcboot;\0"				\
 	"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw "				\
 		"nfsroot=${serverip}:${rootpath}\0"						\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; "		\
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
index 1768023..2784a95 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
@@ -16,7 +16,7 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	7
+#define CONFIG_ENV_VERSION	8
 #define CONFIG_BOARD_NAME	apf6
 
 /* SPL */
@@ -259,7 +259,7 @@
 	"checknload_firmware=if test ${firmware_autoload} = 1;"					\
 				"then run flash_firmware; else exit; fi;\0"			\
 	"mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${board_name}-linux.bin\0" \
-	"mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdir}/dtbs/${cpu_type}-${fdt_name}.dtb\0" \
+	"mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb\0" \
 	"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"			\
 		"${gatewayip}:${netmask}:${hostname}:eth0:off\0"				\
 	"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " 				\
@@ -267,10 +267,10 @@
 	"genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; "	\
 		"run addmmcargs; "								\
 		"run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0"	\
-	"mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcroot /dev/mmcblk1p1 ro; " \
-		"run genmmcboot;\0"								\
-	"emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcroot /dev/mmcblk2p2 ro; " \
-		"run genmmcboot;\0"								\
+	"mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcdtbdir /boot;" \
+		"setenv mmcroot /dev/mmcblk1p1 ro; run genmmcboot;\0"				\
+	"emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcdtbdir /dtbs;"	\
+		"setenv mmcroot /dev/mmcblk2p2 ro; run genmmcboot;\0"				\
 	"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw "				\
 		"nfsroot=${serverip}:${rootpath}\0"						\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; "		\


hooks/post-receive
-- 
armadeus