[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-466-g4212b77

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  4212b778a704a44d0a41e8700879aecfc6449de8 (commit)
      from  3990f54ed608ab6394ff56c92c784eef1642b06f (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 4212b778a704a44d0a41e8700879aecfc6449de8
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Sep 27 14:35:17 2013 +0200

    [UBOOT] keep external environment file as an exemple of customization

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

Summary of changes:
 .../apf9328/apf9328-u-boot-env-2013.04.txt         |   36 ++-----------------
 .../target/device/armadeus/u-boot-env-2013.04.txt  |   38 ++------------------
 2 files changed, 6 insertions(+), 68 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
index 780b806..51c23bf 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
@@ -1,34 +1,4 @@
-# U-Boot / environment variable management scripts
-# FPGA
-download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
-flash_firmware=echo Erasing FLASH;era nor0,3;if cp.b ${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=fpga loadb 0 ${firmware_addr} ${firmware_size} || fpga load 0 ${firmware_addr} ${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 run load_firmware; fi;
-
-# DTB
-
-# kernel
-download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin
-flash_kernel=echo Erasing FLASH;era nor0,4;if cp.b ${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.jffs2
-flash_rootfs=echo Erasing FLASH;era nor0,5;if cp.b ${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_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; bootm ${kernel_addr}
-addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
-nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs; nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;bootm ${loadaddr}
-addjffsargs=setenv bootargs ${bootargs} root=/dev/mtdblock5 rootfstype=jffs2
-jffsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addjffsargs addipargs; bootm ${kernel_addr}
-
-preboot=run check_flash checknload_firmware check_env ;
+# User defined U-Boot / environment variable
+# Add your own variables
+welcome= echo Welcome to the Armadeus development environment.
 
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 f5f9d48..51c23bf 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -1,36 +1,4 @@
-# U-Boot / environment variable management scripts
-# 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
-update_firmware=run download_firmware flash_firmware
-load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga load 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 run load_firmware; else exit; fi;
-
-# DTB
-download_dtb=tftpboot ${loadaddr} ${board_name}.dtb
-flash_dtb=nand erase.part dtb;if nand write.trimffs ${fileaddr} dtb ${filesize};then echo Flashing dtb succeed;else echo Flashing dtb 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_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; 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; 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; 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 ;
+# User defined U-Boot / environment variable
+# Add your own variables
+welcome= echo Welcome to the Armadeus development environment.
 


hooks/post-receive
-- 
armadeus


