[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-367-g638cfbd

[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  638cfbde73437a8e579ce7d1baabdcbc1f27d68c (commit)
      from  af4084b890cb33e45c7403e9935f37b331ddf046 (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 638cfbde73437a8e579ce7d1baabdcbc1f27d68c
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 9 11:32:10 2013 +0200

    [UBOOT] improvement environment scripts

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

Summary of changes:
 .../target/device/armadeus/u-boot-env-2013.04.txt  |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 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 25cd39f..db77f1c 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -3,29 +3,34 @@
 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
 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;
+load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga loadb 0 ${loadaddr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed! fi;
+checknload_firmware=if test -n ${firmware_autoload}; then if test -n ${had_ctrlc}; then echo Firmware download stopped; else run load_firmware; fi; else exit; 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
 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
 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
 update_all=run update_kernel update_rootfs update_env update_uboot
+
 # 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}
+mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; fi;mmc dev 0; ext2load mmc 0 ${kernel_addr_r} /boot/${board_name}-linux.bin;bootm ${kernel_addr_r} - ${fdt_addr_r}
 addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
-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}
+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; else echo no fdt_addr_r; 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}
+ubifsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs};run addubifsargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; 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