[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-711-gc7e8af9

[Fabien M <fa...@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  c7e8af966080093bc15ba25f8439ec82f1783cba (commit)
      from  c03616ae26871af65fa55c184cec0a19062e5b57 (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 c7e8af966080093bc15ba25f8439ec82f1783cba
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Apr 23 16:21:53 2015 +0200

    [U-BOOT][APF6] adding firmware_autoload in uboot environment variables

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

Summary of changes:
 .../device/armadeus/apf6/apf6-u-boot-2014.07.h     |   10 ++++++++--
 .../device/armadeus/apf6/apf6-u-boot-2015.01.h     |   10 ++++++++--
 2 files changed, 16 insertions(+), 4 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 aad1221..1768023 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	6
+#define CONFIG_ENV_VERSION	7
 #define CONFIG_BOARD_NAME	apf6
 
 /* SPL */
@@ -170,7 +170,7 @@
 #define CONFIG_HOSTNAME         CONFIG_BOARD_NAME
 #define CONFIG_ROOTPATH         "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
 
-#define CONFIG_PREBOOT		"run check_env;"
+#define CONFIG_PREBOOT		"run checknload_firmware check_env;"
 
 #define ACFG_CONSOLE_DEV        ttymxc3
 #define CONFIG_SYS_AUTOLOAD	"no"
@@ -252,6 +252,12 @@
 		"fi;\0" 									\
 	"update_rootfs=run download_rootfs flash_rootfs\0" 					\
 	"update_all=run update_kernel update_rootfs update_dtb update_uboot\0"			\
+	"firmware_autoload=0\0"									\
+	"firmware_path=/lib/firmware/fpga/firmware.periph.rbf\0"				\
+	"flash_firmware=ext2load mmc 0:2 ${loadaddr} ${firmware_path} "				\
+				"&& fpga load 0 ${loadaddr} ${filesize}\0"			\
+	"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" \
 	"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"			\
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 aad1221..1768023 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	6
+#define CONFIG_ENV_VERSION	7
 #define CONFIG_BOARD_NAME	apf6
 
 /* SPL */
@@ -170,7 +170,7 @@
 #define CONFIG_HOSTNAME         CONFIG_BOARD_NAME
 #define CONFIG_ROOTPATH         "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
 
-#define CONFIG_PREBOOT		"run check_env;"
+#define CONFIG_PREBOOT		"run checknload_firmware check_env;"
 
 #define ACFG_CONSOLE_DEV        ttymxc3
 #define CONFIG_SYS_AUTOLOAD	"no"
@@ -252,6 +252,12 @@
 		"fi;\0" 									\
 	"update_rootfs=run download_rootfs flash_rootfs\0" 					\
 	"update_all=run update_kernel update_rootfs update_dtb update_uboot\0"			\
+	"firmware_autoload=0\0"									\
+	"firmware_path=/lib/firmware/fpga/firmware.periph.rbf\0"				\
+	"flash_firmware=ext2load mmc 0:2 ${loadaddr} ${firmware_path} "				\
+				"&& fpga load 0 ${loadaddr} ${filesize}\0"			\
+	"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" \
 	"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"			\


hooks/post-receive
-- 
armadeus