[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-805-ge6c1998
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-805-ge6c1998
|
From: Julien B a. A. <ar...@us...> - 2015-07-30 11:22:38
|
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 e6c199807c4f1e74f4620927128d0141c0b11c16 (commit)
via 89a257fa3f4f1bff2c21973f7c4444995c58a64d (commit)
via 5cbc02583041226820235d1f6a5da3c7f62d4819 (commit)
via 2ce48818e80c9aa730aa0f6e7cae2486d61de34a (commit)
via 6cf7b9d26a3bf212e53866ebefa3224eb5f8a34d (commit)
from 50c74caff6ec3d44248b0799a1c08dc2ab3755f3 (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 e6c199807c4f1e74f4620927128d0141c0b11c16
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 30 12:56:50 2015 +0200
[U-BOOT] APF6: 2014.07+: makes kernel image name configurable ('kernelimg' variable) and default it to classic apf6-linux.bin
commit 89a257fa3f4f1bff2c21973f7c4444995c58a64d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 30 12:25:49 2015 +0200
[U-BOOT] APF6: 2014.07+: flash_firmware script is loading firmware not flashing it, so rename it.
commit 5cbc02583041226820235d1f6a5da3c7f62d4819
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 30 12:05:12 2015 +0200
[U-BOOT] APF6: 2014.07+: add ramboot script to ease linux+ramdisk boot
commit 2ce48818e80c9aa730aa0f6e7cae2486d61de34a
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 30 11:27:57 2015 +0200
[U-BOOT] APF6: 2014.07+: use fdt_addr in download_dtb instead of loadaddr (also used by download_kernel) to ease RAM boot of kernel. Adapt flash_dtb aswell.
commit 6cf7b9d26a3bf212e53866ebefa3224eb5f8a34d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 30 11:07:36 2015 +0200
[U-BOOT] APF6: 2014.07+: Add initargs script to factorize bootargs initialization
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 36 +++++++++++---------
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 36 +++++++++++---------
2 files changed, 40 insertions(+), 32 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 2784a95..1e79c52 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 8
+#define CONFIG_ENV_VERSION 13
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -193,6 +193,9 @@
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk2p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
+ "firmware_autoload=0\0" \
+ "firmware_path=/lib/firmware/fpga/firmware.periph.rbf\0" \
+ "kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \
"check_env=if test -n ${flash_env_version}; " \
"then env default env_version; " \
"else env set flash_env_version ${env_version}; env save; " \
@@ -226,16 +229,16 @@
"fi;\0" \
"update_uboot=run download_uboot_spl flash_uboot_spl " \
"download_uboot_img flash_uboot_img\0" \
- "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
+ "download_kernel=tftpboot ${loadaddr} ${kernelimg}\0" \
"flash_kernel=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${board_name}-linux.bin ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${kernelimg} ${filesize}; then " \
"echo Flashing of kernel succeed; " \
"else echo Flashing of kernel failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
- "download_dtb=tftpboot ${loadaddr} ${cpu_type}-${fdt_name}.dtb\0" \
+ "download_dtb=tftpboot ${fdt_addr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -252,30 +255,31 @@
"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" \
+ "load_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" \
+ "then run load_firmware; else exit; fi;\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${kernelimg}\0" \
"mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb\0" \
+ "initargs=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
- "run addmmcargs; " \
+ "genmmcboot=run initargs; run addmmcargs; " \
"run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\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" \
+ "addramargs=setenv bootargs ${bootargs} root=/dev/ram rw\0" \
+ "ramboot=run initargs; run addramargs; " \
+ "run download_kernel && run download_dtb && " \
+ "bootz ${loadaddr} - ${fdt_addr};\0" \
"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
- "nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
- "run addnfsargs addipargs; " \
- "nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin && " \
+ "nfsboot=run initargs; run addnfsargs addipargs; " \
+ "nfs ${loadaddr} ${serverip}:${rootpath}/boot/${kernelimg} && " \
"nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
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 2784a95..1e79c52 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 8
+#define CONFIG_ENV_VERSION 13
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -193,6 +193,9 @@
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk2p2 ro\0" \
"mmcrootfstype=ext4 rootwait\0" \
+ "firmware_autoload=0\0" \
+ "firmware_path=/lib/firmware/fpga/firmware.periph.rbf\0" \
+ "kernelimg=" __stringify(CONFIG_BOARD_NAME) "-linux.bin\0" \
"check_env=if test -n ${flash_env_version}; " \
"then env default env_version; " \
"else env set flash_env_version ${env_version}; env save; " \
@@ -226,16 +229,16 @@
"fi;\0" \
"update_uboot=run download_uboot_spl flash_uboot_spl " \
"download_uboot_img flash_uboot_img\0" \
- "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
+ "download_kernel=tftpboot ${loadaddr} ${kernelimg}\0" \
"flash_kernel=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${board_name}-linux.bin ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${kernelimg} ${filesize}; then " \
"echo Flashing of kernel succeed; " \
"else echo Flashing of kernel failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
- "download_dtb=tftpboot ${loadaddr} ${cpu_type}-${fdt_name}.dtb\0" \
+ "download_dtb=tftpboot ${fdt_addr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -252,30 +255,31 @@
"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" \
+ "load_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" \
+ "then run load_firmware; else exit; fi;\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${kernelimg}\0" \
"mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb\0" \
+ "initargs=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
- "run addmmcargs; " \
+ "genmmcboot=run initargs; run addmmcargs; " \
"run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\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" \
+ "addramargs=setenv bootargs ${bootargs} root=/dev/ram rw\0" \
+ "ramboot=run initargs; run addramargs; " \
+ "run download_kernel && run download_dtb && " \
+ "bootz ${loadaddr} - ${fdt_addr};\0" \
"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
- "nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
- "run addnfsargs addipargs; " \
- "nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin && " \
+ "nfsboot=run initargs; run addnfsargs addipargs; " \
+ "nfs ${loadaddr} ${serverip}:${rootpath}/boot/${kernelimg} && " \
"nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
hooks/post-receive
--
armadeus
|