From 15e1cbe6534accaeb7b8a604523b921f61b2c2f4 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 2 Nov 2015 18:35:02 +0100 Subject: apalis/colibri_t20/t30: further generalise u-boot update scripts Further generalise U-Boot update scripts by using ${board_name} instead of hard coding module name like apalis_t30, colibri_t20 or colibri_t30. --- recipes/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr | 2 +- recipes/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr | 2 +- recipes/images/files/colibri-t20/colibri-t20_bin/flash_blk.scr | 2 +- recipes/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr | 2 +- recipes/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr | 2 +- recipes/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes') diff --git a/recipes/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr b/recipes/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr index 1e4a21f..9223e13 100644 --- a/recipes/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr +++ b/recipes/images/files/apalis-t30/apalis-t30_bin/flash_blk.scr @@ -19,7 +19,7 @@ setenv migrate_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; run migrat setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/apalis_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' +setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' diff --git a/recipes/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr b/recipes/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr index d6bfa03..16d8073 100644 --- a/recipes/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr +++ b/recipes/images/files/apalis-t30/apalis-t30_bin/flash_eth.scr @@ -16,7 +16,7 @@ setenv migrate_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; run migrat setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/apalis_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' diff --git a/recipes/images/files/colibri-t20/colibri-t20_bin/flash_blk.scr b/recipes/images/files/colibri-t20/colibri-t20_bin/flash_blk.scr index 5c0a72f..f77000d 100644 --- a/recipes/images/files/colibri-t20/colibri-t20_bin/flash_blk.scr +++ b/recipes/images/files/colibri-t20/colibri-t20_bin/flash_blk.scr @@ -12,7 +12,7 @@ setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_ setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' setenv update_configblock 'load ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand erase.part cfgblock && nand write ${loadaddr} cfgblock ${filesize}' -setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/colibri_t20-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${loadaddr} 0x0 ${filesize}' +setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${board_name}-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${loadaddr} 0x0 ${filesize}' setenv update_rootfs 'load ${interface} 0:1 ${loadaddr} ${board_name}/ubifs_${leb-size}.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' setenv echo_v2.3b7 echo "successfully updated U-Boot," \${note} "power-cycle and enter \"run setupdate\; run migrate_v2.3b7\" to complete update" diff --git a/recipes/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr b/recipes/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr index 7fd62ce..bb2bd85 100644 --- a/recipes/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr +++ b/recipes/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr @@ -10,7 +10,7 @@ setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_ setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand erase.part cfgblock && nand write ${loadaddr} cfgblock ${filesize}' -setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/colibri_t20-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${loadaddr} 0x0 ${filesize}' +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/${board_name}-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${loadaddr} 0x0 ${filesize}' setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs_${leb-size}.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' setenv echo_v2.3b7 echo "successfully updated U-Boot," \${note} "power-cycle and enter \"run setupdate\; run migrate_v2.3b7\" to complete update" diff --git a/recipes/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr b/recipes/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr index dd5fc4e..fd00307 100644 --- a/recipes/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr +++ b/recipes/images/files/colibri-t30/colibri-t30_bin/flash_blk.scr @@ -19,7 +19,7 @@ setenv migrate_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; run migrat setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/colibri_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' +setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' diff --git a/recipes/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr b/recipes/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr index 1feb64b..39e9424 100644 --- a/recipes/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr +++ b/recipes/images/files/colibri-t30/colibri-t30_bin/flash_eth.scr @@ -16,7 +16,7 @@ setenv migrate_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; run migrat setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/colibri_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/${board_name}.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -- cgit v1.2.3