[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-353-g9764d74

[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  9764d74f32ee8f4570affc4285bae96187f46fcf (commit)
      from  4b9362953e12891dd89e80bae2e0b417303ae337 (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 9764d74f32ee8f4570affc4285bae96187f46fcf
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Aug 6 10:56:22 2013 +0200

    [UBOOT] enhance FPGA / firmware management scripts.

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

Summary of changes:
 .../target/device/armadeus/u-boot-env-2013.04.txt  |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
index 563f558..25cd39f 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -1,23 +1,25 @@
 # U-Boot / environment variable management scripts
-autoload=no
-# FPGA management scripts
-firmware_autoload=0
+# FPGA
+download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
 flash_firmware=nand erase.part firmware;if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};then echo Flashing of Firmware succeed;else echo Flashing of Firmware failed;fi
-# DTB management scripts
+update_firmware=run download_firmware flash_firmware
+load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga loadb 0 ${loadaddr} ${firmware_size};
+checknload_firmware=if test -n ${firmware_autoload}; then if test -n ${had_ctrlc}; then echo Firmware download stopped!; else run load_firmware && echo Firmware successfully programmed; fi; fi;
+# DTB
 download_dtb=tftpboot ${loadaddr} ${cpu_name}-${board_name}.dtb
 flash_dtb=nand erase.part dtb;if nand write.trimffs ${fileaddr} dtb ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
 update_dtb=run download_dtb flash_dtb
-# kernel management scripts
+# kernel
 download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin
 flash_kernel=nand erase.part kernel;if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};then echo Flashing of kernel succeed;else echo Flashing of kernel failed;fi
 update_kernel=run download_kernel flash_kernel
-# rootfs management scripts
+# rootfs
 download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi
 flash_rootfs=nand erase.part rootfs;if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
 update_rootfs=run download_rootfs flash_rootfs
-# update management scripts
+# update
 update_all=run update_kernel update_rootfs update_env update_uboot
-# boot management scripts
+# boot
 addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
 addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 rootfstype=ext2
 mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; fi;mmc dev 0; ext2load mmc 0 ${kernel_addr_r} /boot/${board_name}-linux.bin;bootm ${kernel_addr_r} - ${fdt_addr_r}
@@ -25,4 +27,5 @@ addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${ro
 nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs;nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; fi;bootm ${kernel_addr_r} - ${fdt_addr_r}
 addubifsargs=setenv bootargs ${bootargs} ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs
 ubifsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs};run addubifsargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; fi;nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - ${fdt_addr_r}
+preboot=run check_flash checknload_firmware check_env ;
 


hooks/post-receive
-- 
armadeus