[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-231-gf8f1f6b
Brought to you by:
sszy
|
From: Fabien M <fa...@us...> - 2014-04-25 13:42:11
|
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 f8f1f6b56a8a480ddbd1f75d65e629d8760cc55a (commit)
from 8db7516a6383bd4626ab6ceb9cc5a1804422cc4a (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 f8f1f6b56a8a480ddbd1f75d65e629d8760cc55a
Author: Fabien Marteau <fab...@ar...>
Date: Fri Apr 25 15:41:33 2014 +0200
[uboot] firmware_autoload set to 0 by default
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 3 ++-
.../device/armadeus/apf27/apf27-u-boot-2014.04.h | 5 +++--
.../device/armadeus/apf51/apf51-u-boot-2013.04.h | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index ef0aa87..4a8db7a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -249,6 +249,7 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
+ "firmware_autoload=0\0" \
"checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
@@ -277,7 +278,7 @@
"update_all=run update_kernel update_rootfs update_uboot &&" \
"if test -n ${fdt_addr_r};" \
"then run update_dtb; else exit; fi &&" \
- "if test -n ${firmware_autoload};" \
+ "if test ${firmware_autoload} -eq 1;" \
"then run update_firmware; else exit; fi;\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
index f395b8d..913fce3 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
@@ -244,7 +244,8 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
- "checknload_firmware=if test -n ${firmware_autoload};" \
+ "firmware_autoload=0\0" \
+ "checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
"flash_dtb=nand erase.part dtb;" \
@@ -272,7 +273,7 @@
"update_all=run update_kernel update_rootfs update_uboot &&" \
"if test -n ${fdt_addr_r};" \
"then run update_dtb; else exit; fi &&" \
- "if test -n ${firmware_autoload};" \
+ "if test ${firmware_autoload} -eq 1;" \
"then run update_firmware; else exit; fi;\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index 2af3e74..79440f1 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -255,6 +255,7 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
+ "firmware_autoload=0\0" \
"checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
@@ -283,7 +284,7 @@
"update_all=run update_kernel update_rootfs update_uboot &&" \
"if test -n ${fdt_addr_r};" \
"then run update_dtb; else exit; fi &&" \
- "if test -n ${firmware_autoload};" \
+ "if test ${firmware_autoload} -eq 1;" \
"then run update_firmware; else exit; fi;\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
hooks/post-receive
--
armadeus
|