From 8a6d1bb3afe9e76156d7999e720527a4f1b3a871 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 20 Oct 2015 14:56:24 +0200 Subject: update.sh: use moduletype specific folder for output files With update.sh one creates files on e.g. a SD-card or a tftp server which enables updating the SW on a module from U-Boot running on said module. This commit adds a module type specific directory on that output media so that update data for multiple module types can be stored on one media. Generic U-Boot scripts in the media's root directory do select the matching update data depending on module type. --- .../apalis-imx6/apalis-imx6_bin/flash_blk.scr | 20 ++++---- .../apalis-imx6/apalis-imx6_bin/flash_eth.scr | 16 +++---- .../apalis-imx6/apalis-imx6_bin/flash_mmc.scr | 6 --- .../files/apalis-imx6/apalis-imx6_bin/fwd_blk.scr | 1 + .../files/apalis-imx6/apalis-imx6_bin/fwd_eth.scr | 1 + .../files/apalis-imx6/apalis-imx6_bin/fwd_mmc.scr | 1 + .../files/apalis-t30/apalis-t30_bin/flash_blk.scr | 18 ++++---- .../files/apalis-t30/apalis-t30_bin/flash_eth.scr | 14 +++--- .../files/apalis-t30/apalis-t30_bin/flash_mmc.scr | 6 --- .../files/apalis-t30/apalis-t30_bin/fwd_blk.scr | 1 + .../files/apalis-t30/apalis-t30_bin/fwd_eth.scr | 1 + .../files/apalis-t30/apalis-t30_bin/fwd_mmc.scr | 1 + .../colibri-imx6/colibri-imx6_bin/flash_blk.scr | 14 +++--- .../colibri-imx6/colibri-imx6_bin/flash_eth.scr | 14 +++--- .../colibri-imx6/colibri-imx6_bin/flash_mmc.scr | 6 --- .../colibri-imx6/colibri-imx6_bin/fwd_blk.scr | 1 + .../colibri-imx6/colibri-imx6_bin/fwd_eth.scr | 1 + .../colibri-imx6/colibri-imx6_bin/fwd_mmc.scr | 1 + .../colibri-t20/colibri-t20_bin/flash_blk.scr | 7 ++- .../colibri-t20/colibri-t20_bin/flash_eth.scr | 6 +-- .../files/colibri-t20/colibri-t20_bin/fwd_blk.scr | 1 + .../files/colibri-t20/colibri-t20_bin/fwd_eth.scr | 1 + .../files/colibri-t20/colibri-t20_bin/fwd_mmc.scr | 1 + .../colibri-t30/colibri-t30_bin/flash_blk.scr | 18 ++++---- .../colibri-t30/colibri-t30_bin/flash_eth.scr | 14 +++--- .../colibri-t30/colibri-t30_bin/flash_mmc.scr | 6 --- .../files/colibri-t30/colibri-t30_bin/fwd_blk.scr | 1 + .../files/colibri-t30/colibri-t30_bin/fwd_eth.scr | 1 + .../files/colibri-t30/colibri-t30_bin/fwd_mmc.scr | 1 + .../files/colibri-vf/colibri-vf_bin/flash_blk.scr | 6 +-- .../files/colibri-vf/colibri-vf_bin/flash_eth.scr | 6 +-- .../files/colibri-vf/colibri-vf_bin/flash_mmc.scr | 3 -- .../files/colibri-vf/colibri-vf_bin/fwd_blk.scr | 1 + .../files/colibri-vf/colibri-vf_bin/fwd_eth.scr | 1 + .../files/colibri-vf/colibri-vf_bin/fwd_mmc.scr | 1 + recipes/images/files/colibri-vf/update.sh | 20 +++++--- recipes/images/files/library/fwd_blk.scr | 8 ++++ recipes/images/files/library/fwd_eth.scr | 3 ++ recipes/images/files/library/fwd_mmc.scr | 9 ++++ recipes/images/files/library/imx6/update.sh | 35 ++++++++------ recipes/images/files/library/tegra/update.sh | 53 +++++++++++++--------- 41 files changed, 179 insertions(+), 147 deletions(-) delete mode 100644 recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_mmc.scr create mode 120000 recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_blk.scr create mode 120000 recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_eth.scr create mode 120000 recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_mmc.scr delete mode 100644 recipes/images/files/apalis-t30/apalis-t30_bin/flash_mmc.scr create mode 120000 recipes/images/files/apalis-t30/apalis-t30_bin/fwd_blk.scr create mode 120000 recipes/images/files/apalis-t30/apalis-t30_bin/fwd_eth.scr create mode 120000 recipes/images/files/apalis-t30/apalis-t30_bin/fwd_mmc.scr delete mode 100644 recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_mmc.scr create mode 120000 recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_blk.scr create mode 120000 recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_eth.scr create mode 120000 recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_mmc.scr create mode 120000 recipes/images/files/colibri-t20/colibri-t20_bin/fwd_blk.scr create mode 120000 recipes/images/files/colibri-t20/colibri-t20_bin/fwd_eth.scr create mode 120000 recipes/images/files/colibri-t20/colibri-t20_bin/fwd_mmc.scr delete mode 100644 recipes/images/files/colibri-t30/colibri-t30_bin/flash_mmc.scr create mode 120000 recipes/images/files/colibri-t30/colibri-t30_bin/fwd_blk.scr create mode 120000 recipes/images/files/colibri-t30/colibri-t30_bin/fwd_eth.scr create mode 120000 recipes/images/files/colibri-t30/colibri-t30_bin/fwd_mmc.scr delete mode 100644 recipes/images/files/colibri-vf/colibri-vf_bin/flash_mmc.scr create mode 120000 recipes/images/files/colibri-vf/colibri-vf_bin/fwd_blk.scr create mode 120000 recipes/images/files/colibri-vf/colibri-vf_bin/fwd_eth.scr create mode 120000 recipes/images/files/colibri-vf/colibri-vf_bin/fwd_mmc.scr create mode 100644 recipes/images/files/library/fwd_blk.scr create mode 100644 recipes/images/files/library/fwd_eth.scr create mode 100644 recipes/images/files/library/fwd_mmc.scr diff --git a/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_blk.scr b/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_blk.scr index 353ff70..529321d 100644 --- a/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_blk.scr +++ b/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_blk.scr @@ -4,16 +4,16 @@ test -n ${drive} || setenv drive 1 setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' -setenv cp_file_chunk 'fatload ${interface} ${drive}:1 ${loadaddr} root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' -setenv update_uboot_it 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot-it.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' -setenv update_kernel 'fatload ${interface} ${drive}:1 ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'fatload ${interface} ${drive}:1 ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'fatload ${interface} ${drive}:1 ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' +setenv cp_file_chunk 'fatload ${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 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +setenv update_uboot_it 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot-it.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +setenv update_kernel 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_fdt 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_configblock 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' setenv update 'run update_1; run update_uboot; run update_2; run update_3; reset' setenv update_it 'run update_1; run update_uboot_it; run update_2; run update_3; reset' -setenv update_1 'fatload ${interface} ${drive}:1 ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'fatload ${interface} ${drive}:1 ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' -#do it in chunks of 256M to fit into DDR RAM of the smallest module -setenv update_3 'setenv filesize 10000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "10000000"; do run cp_file_chunk; run set_nextpos; done' +setenv update_1 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +#do it in chunks of 64M to fit into DDR RAM of the smallest module +setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done' echo 'enter "run update" or "run update_it" to update the entire module' diff --git a/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_eth.scr b/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_eth.scr index 56f8441..1add51d 100644 --- a/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_eth.scr +++ b/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_eth.scr @@ -1,16 +1,16 @@ setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' setenv set_nextnum 'setexpr filenum ${filenum} + 1; setexpr blkstart ${blkstart} + ${blkcnt}' -setenv cp_file_chunk 'tftpboot ${loadaddr} root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'tftpboot ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' -setenv update_uboot_it 'tftpboot ${loadaddr} u-boot-it.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' -setenv update_kernel 'tftpboot ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'tftpboot ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'tftpboot ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' +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}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +setenv update_uboot_it 'tftpboot ${loadaddr} ${board_name}/u-boot-it.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' setenv update 'run update_1; run update_uboot; run update_2; run update_3; reset' setenv update_it 'run update_1; run update_uboot_it; run update_2; run update_3; reset' -setenv update_1 'tftpboot ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'tftpboot ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' #do it in chunks of 64M to fit into DDR RAM of the smallest module #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- diff --git a/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_mmc.scr b/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_mmc.scr deleted file mode 100644 index 207c7db..0000000 --- a/recipes/images/files/apalis-imx6/apalis-imx6_bin/flash_mmc.scr +++ /dev/null @@ -1,6 +0,0 @@ -#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img -source ${loadaddr} diff --git a/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_blk.scr b/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_blk.scr new file mode 120000 index 0000000..5954646 --- /dev/null +++ b/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_blk.scr @@ -0,0 +1 @@ +../../library/fwd_blk.scr \ No newline at end of file diff --git a/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_eth.scr b/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_eth.scr new file mode 120000 index 0000000..decc214 --- /dev/null +++ b/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_eth.scr @@ -0,0 +1 @@ +../../library/fwd_eth.scr \ No newline at end of file diff --git a/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_mmc.scr b/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_mmc.scr new file mode 120000 index 0000000..3848cfa --- /dev/null +++ b/recipes/images/files/apalis-imx6/apalis-imx6_bin/fwd_mmc.scr @@ -0,0 +1 @@ +../../library/fwd_mmc.scr \ No newline at end of file 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 4908b49..17cb4e8 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 @@ -17,20 +17,20 @@ setenv migrate_5 'mmc dev 0 0; mmc read ${loadaddr} 36000 1; setenv conf_blk_off setenv migrate_6 'mmc dev 0 0; mmc read ${loadaddr} 37000 1; setenv conf_blk_offset 0x7ff; crc32 -v $toradex_oui_addr 3 94305232 && mmc dev 0 1 && mmc write $loadaddr $conf_blk_offset 1' setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6' -setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' +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} 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}/apalis_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' -setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' +setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' -setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' -#do it in chunks of 256M to fit into DDR RAM of the smallest module -setenv update_3 'setenv filesize 10000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "10000000"; do run cp_file_chunk; run set_nextpos; done' +setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +#do it in chunks of 64M to fit into DDR RAM of the smallest module +setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done' setenv echo_v2.3b2 echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_v2.3b2\" to complete update" setenv migrate_v2.3b2 'run migrate_configblock; run update_new' 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 a161d5a..8dc5405 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 @@ -14,18 +14,18 @@ setenv migrate_5 'mmc dev 0 0; mmc read ${loadaddr} 36000 1; setenv conf_blk_off setenv migrate_6 'mmc dev 0 0; mmc read ${loadaddr} 37000 1; setenv conf_blk_offset 0x7ff; crc32 -v $toradex_oui_addr 3 94305232 && mmc dev 0 1 && mmc write $loadaddr $conf_blk_offset 1' setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6' -setenv cp_file_chunk 'tftpboot ${loadaddr} root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' +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} apalis_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${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_kernel 'tftpboot ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'tftpboot ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' +setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' -setenv update_1 'tftpboot ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'tftpboot ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' #do it in chunks of 64M to fit into DDR RAM of the smallest module #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- diff --git a/recipes/images/files/apalis-t30/apalis-t30_bin/flash_mmc.scr b/recipes/images/files/apalis-t30/apalis-t30_bin/flash_mmc.scr deleted file mode 100644 index 207c7db..0000000 --- a/recipes/images/files/apalis-t30/apalis-t30_bin/flash_mmc.scr +++ /dev/null @@ -1,6 +0,0 @@ -#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img -source ${loadaddr} diff --git a/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_blk.scr b/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_blk.scr new file mode 120000 index 0000000..5954646 --- /dev/null +++ b/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_blk.scr @@ -0,0 +1 @@ +../../library/fwd_blk.scr \ No newline at end of file diff --git a/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_eth.scr b/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_eth.scr new file mode 120000 index 0000000..decc214 --- /dev/null +++ b/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_eth.scr @@ -0,0 +1 @@ +../../library/fwd_eth.scr \ No newline at end of file diff --git a/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_mmc.scr b/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_mmc.scr new file mode 120000 index 0000000..3848cfa --- /dev/null +++ b/recipes/images/files/apalis-t30/apalis-t30_bin/fwd_mmc.scr @@ -0,0 +1 @@ +../../library/fwd_mmc.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr index 2665a8c..12a29e8 100644 --- a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr +++ b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_blk.scr @@ -4,14 +4,14 @@ test -n ${drive} || setenv drive 1 setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' -setenv cp_file_chunk 'fatload ${interface} ${drive}:1 ${loadaddr} root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' -setenv update_kernel 'fatload ${interface} ${drive}:1 ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'fatload ${interface} ${drive}:1 ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'fatload ${interface} ${drive}:1 ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' +setenv cp_file_chunk 'fatload ${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 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' +setenv update_kernel 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_fdt 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_configblock 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' setenv update 'run update_1; run update_uboot; run update_2; run update_3; reset' -setenv update_1 'fatload ${interface} ${drive}:1 ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'fatload ${interface} ${drive}:1 ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +setenv update_1 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' #do it in chunks of 64M to fit into DDR RAM of the smallest module setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done' echo 'enter "run update" to update the entire module' diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr index 0a671bd..b4ac314 100644 --- a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr +++ b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_eth.scr @@ -1,14 +1,14 @@ setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' setenv set_nextnum 'setexpr filenum ${filenum} + 1; setexpr blkstart ${blkstart} + ${blkcnt}' -setenv cp_file_chunk 'tftpboot ${loadaddr} root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' -setenv update_uboot 'tftpboot ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' -setenv update_kernel 'tftpboot ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'tftpboot ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'tftpboot ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' +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}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x500 ${blkcnt}' setenv update 'run update_1; run update_uboot; run update_2; run update_3; reset' -setenv update_1 'tftpboot ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'tftpboot ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' #do it in chunks of 64M to fit into DDR RAM of the smallest module #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_mmc.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_mmc.scr deleted file mode 100644 index 207c7db..0000000 --- a/recipes/images/files/colibri-imx6/colibri-imx6_bin/flash_mmc.scr +++ /dev/null @@ -1,6 +0,0 @@ -#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img -source ${loadaddr} diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_blk.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_blk.scr new file mode 120000 index 0000000..5954646 --- /dev/null +++ b/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_blk.scr @@ -0,0 +1 @@ +../../library/fwd_blk.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_eth.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_eth.scr new file mode 120000 index 0000000..decc214 --- /dev/null +++ b/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_eth.scr @@ -0,0 +1 @@ +../../library/fwd_eth.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_mmc.scr b/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_mmc.scr new file mode 120000 index 0000000..3848cfa --- /dev/null +++ b/recipes/images/files/colibri-imx6/colibri-imx6_bin/fwd_mmc.scr @@ -0,0 +1 @@ +../../library/fwd_mmc.scr \ No newline at end of file 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 fe0ffbb..5c0a72f 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 @@ -1,5 +1,4 @@ test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 test -n ${hw-version} || if test $lnxoffset = 0x1200000; then setenv hw-version v11; else setenv hw-version v12; fi @@ -12,9 +11,9 @@ setenv migrate_4 'nand read $loadaddr 0x7900000 0x40; crc32 -v $toradex_oui_addr setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4' setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' -setenv update_configblock 'load ${interface} 0:1 ${loadaddr} configblock.bin && nand erase.part cfgblock && nand write ${loadaddr} cfgblock ${filesize}' -setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} colibri_t20-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${loadaddr} 0x0 ${filesize}' -setenv update_rootfs 'load ${interface} 0:1 ${loadaddr} ubifs_${leb-size}.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' +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_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" setenv migrate_v2.3b7 'run migrate_configblock; nand erase.part ubi; run update_new' 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 27bb296..7fd62ce 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 @@ -9,9 +9,9 @@ setenv migrate_4 'nand read $loadaddr 0x7900000 0x40; crc32 -v $toradex_oui_addr setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4' setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' -setenv update_configblock 'tftpboot ${loadaddr} configblock.bin && nand erase.part cfgblock && nand write ${loadaddr} cfgblock ${filesize}' -setenv update_uboot 'tftpboot ${loadaddr} colibri_t20-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${loadaddr} 0x0 ${filesize}' -setenv update_rootfs 'tftpboot ${loadaddr} ubifs_${leb-size}.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' +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_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" setenv migrate_v2.3b7 'run migrate_configblock; nand erase.part ubi; run update_new' diff --git a/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_blk.scr b/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_blk.scr new file mode 120000 index 0000000..5954646 --- /dev/null +++ b/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_blk.scr @@ -0,0 +1 @@ +../../library/fwd_blk.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_eth.scr b/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_eth.scr new file mode 120000 index 0000000..decc214 --- /dev/null +++ b/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_eth.scr @@ -0,0 +1 @@ +../../library/fwd_eth.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_mmc.scr b/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_mmc.scr new file mode 120000 index 0000000..3848cfa --- /dev/null +++ b/recipes/images/files/colibri-t20/colibri-t20_bin/fwd_mmc.scr @@ -0,0 +1 @@ +../../library/fwd_mmc.scr \ No newline at end of file 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 d47ae8a..6ece8aa 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 @@ -17,20 +17,20 @@ setenv migrate_5 'mmc dev 0 0; mmc read ${loadaddr} 36000 1; setenv conf_blk_off setenv migrate_6 'mmc dev 0 0; mmc read ${loadaddr} 37000 1; setenv conf_blk_offset 0x7ff; crc32 -v $toradex_oui_addr 3 94305232 && mmc dev 0 1 && mmc write $loadaddr $conf_blk_offset 1' setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6' -setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' +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} 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}/colibri_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${blkcnt}' -setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' +setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' -setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' -#do it in chunks of 256M to fit into DDR RAM of the smallest module -setenv update_3 'setenv filesize 10000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "10000000"; do run cp_file_chunk; run set_nextpos; done' +setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +#do it in chunks of 64M to fit into DDR RAM of the smallest module +setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done' setenv echo_v2.3b1 echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_v2.3b1\" to complete update" setenv migrate_v2.3b1 'run migrate_configblock; run update_new' 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 797dd4c..1ac600f 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 @@ -14,18 +14,18 @@ setenv migrate_5 'mmc dev 0 0; mmc read ${loadaddr} 36000 1; setenv conf_blk_off setenv migrate_6 'mmc dev 0 0; mmc read ${loadaddr} 37000 1; setenv conf_blk_offset 0x7ff; crc32 -v $toradex_oui_addr 3 94305232 && mmc dev 0 1 && mmc write $loadaddr $conf_blk_offset 1' setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4; run migrate_5; run migrate_6' -setenv cp_file_chunk 'tftpboot ${loadaddr} root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' +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} colibri_t30.img && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 0x0 ${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_kernel 'tftpboot ${loadaddr} uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' -setenv update_fdt 'tftpboot ${loadaddr} ${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' -setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' +setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} ${blkcnt}' -setenv update_1 'tftpboot ${loadaddr} mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' -setenv update_2 'tftpboot ${loadaddr} boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' #do it in chunks of 64M to fit into DDR RAM of the smallest module #split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- diff --git a/recipes/images/files/colibri-t30/colibri-t30_bin/flash_mmc.scr b/recipes/images/files/colibri-t30/colibri-t30_bin/flash_mmc.scr deleted file mode 100644 index 207c7db..0000000 --- a/recipes/images/files/colibri-t30/colibri-t30_bin/flash_mmc.scr +++ /dev/null @@ -1,6 +0,0 @@ -#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img -source ${loadaddr} diff --git a/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_blk.scr b/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_blk.scr new file mode 120000 index 0000000..5954646 --- /dev/null +++ b/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_blk.scr @@ -0,0 +1 @@ +../../library/fwd_blk.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_eth.scr b/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_eth.scr new file mode 120000 index 0000000..decc214 --- /dev/null +++ b/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_eth.scr @@ -0,0 +1 @@ +../../library/fwd_eth.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_mmc.scr b/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_mmc.scr new file mode 120000 index 0000000..3848cfa --- /dev/null +++ b/recipes/images/files/colibri-t30/colibri-t30_bin/fwd_mmc.scr @@ -0,0 +1 @@ +../../library/fwd_mmc.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr index 5a00983..5c27563 100644 --- a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr +++ b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr @@ -1,9 +1,9 @@ setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' -setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' +setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' -setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' -setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ubifs.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' +setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' +setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' setenv update_new 'run update_uboot; run update_rootfs; reset' diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr index f7e9709..776649e 100644 --- a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr +++ b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr @@ -1,9 +1,9 @@ setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' -setenv update_configblock 'tftpboot ${loadaddr} configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' +setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' -setenv update_uboot 'tftpboot ${loadaddr} u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' -setenv update_rootfs 'tftpboot ${loadaddr} ubifs.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' +setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' setenv update_new 'run update_uboot; run update_rootfs; reset' diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_mmc.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_mmc.scr deleted file mode 100644 index e0770a0..0000000 --- a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_mmc.scr +++ /dev/null @@ -1,3 +0,0 @@ -setenv interface mmc -fatload ${interface} 0:1 ${loadaddr} flash_blk.img -source ${loadaddr} diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_blk.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_blk.scr new file mode 120000 index 0000000..5954646 --- /dev/null +++ b/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_blk.scr @@ -0,0 +1 @@ +../../library/fwd_blk.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_eth.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_eth.scr new file mode 120000 index 0000000..decc214 --- /dev/null +++ b/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_eth.scr @@ -0,0 +1 @@ +../../library/fwd_eth.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_mmc.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_mmc.scr new file mode 120000 index 0000000..3848cfa --- /dev/null +++ b/recipes/images/files/colibri-vf/colibri-vf_bin/fwd_mmc.scr @@ -0,0 +1 @@ +../../library/fwd_mmc.scr \ No newline at end of file diff --git a/recipes/images/files/colibri-vf/update.sh b/recipes/images/files/colibri-vf/update.sh index 7212fe0..1205017 100755 --- a/recipes/images/files/colibri-vf/update.sh +++ b/recipes/images/files/colibri-vf/update.sh @@ -104,6 +104,12 @@ if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then exit 0 fi +# is OUT_DIR an existing directory? +if [ ! -d "$OUT_DIR" ] ; then + echo "$OUT_DIR" "does not exist, exiting" + exit 1 +fi + # auto detect MODTYPE from rootfs directory if [ -f rootfs/etc/issue ] ; then CNT=`grep -c "VF" rootfs/etc/issue || true` @@ -111,8 +117,8 @@ if [ -f rootfs/etc/issue ] ; then echo "Colibri VF rootfs detected" MODTYPE=colibri-vf IMAGEFILE=ubifs.img - LOCPATH="vf_flash" + OUT_DIR="$OUT_DIR/colibri_vf" fi fi @@ -136,12 +142,6 @@ if [ "$UBOOT_RECOVERY" -eq 1 ] ; then exit 0 fi -# is OUT_DIR an existing directory? -if [ ! -d "$OUT_DIR" ] ; then - echo "$OUT_DIR" "does not exist, exiting" - exit 1 -fi - #sanity check for correct untared rootfs DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'` if [ "${DEV_OWNER}x" != "rootx" ] @@ -178,8 +178,14 @@ basename "`readlink -e ${BINARIES}/u-boot.imx`" >> ${BINARIES}/versions.txt $ECHO -n "Rootfs " >> ${BINARIES}/versions.txt grep VF rootfs/etc/issue >> ${BINARIES}/versions.txt +#create subdirectory for this module type +sudo mkdir -p "$OUT_DIR" + #copy to $OUT_DIR sudo cp ${BINARIES}/u-boot-nand.imx ${BINARIES}/ubifs.img ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR" +sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img" +sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img" +sudo cp ${BINARIES}/fwd_mmc.img "$OUT_DIR/../flash_mmc.img" #cleanup intermediate files sudo rm ${BINARIES}/ubifs.img ${BINARIES}/versions.txt sync diff --git a/recipes/images/files/library/fwd_blk.scr b/recipes/images/files/library/fwd_blk.scr new file mode 100644 index 0000000..9db3744 --- /dev/null +++ b/recipes/images/files/library/fwd_blk.scr @@ -0,0 +1,8 @@ +#the update.sh script renames this. fwd_blk.scr -> ../flash_blk.img +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 +test "${board_name}" = "colibri_t20" && setenv drive 0 +test "${board_name}" = "colibri_vf" && setenv drive 0 + +fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/flash_blk.img +source ${loadaddr} diff --git a/recipes/images/files/library/fwd_eth.scr b/recipes/images/files/library/fwd_eth.scr new file mode 100644 index 0000000..18ae3ad --- /dev/null +++ b/recipes/images/files/library/fwd_eth.scr @@ -0,0 +1,3 @@ +#the update.sh script renames this. fwd_eth.scr -> ../flash_eth.img +tftpboot ${loadaddr} "${board_name}/flash_eth.img" +source ${loadaddr} diff --git a/recipes/images/files/library/fwd_mmc.scr b/recipes/images/files/library/fwd_mmc.scr new file mode 100644 index 0000000..561a861 --- /dev/null +++ b/recipes/images/files/library/fwd_mmc.scr @@ -0,0 +1,9 @@ +#the update.sh script renames this. fwd_mmc.scr -> ../flash_mmc.img +#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 +test "${board_name}" = "colibri_t20" && setenv drive 0 +test "${board_name}" = "colibri_vf" && setenv drive 0 + +fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/flash_blk.img +source ${loadaddr} diff --git a/recipes/images/files/library/imx6/update.sh b/recipes/images/files/library/imx6/update.sh index 5c3ecae..509dbbe 100755 --- a/recipes/images/files/library/imx6/update.sh +++ b/recipes/images/files/library/imx6/update.sh @@ -95,31 +95,39 @@ if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then exit 0 fi +# is OUT_DIR an existing directory? +if [ ! -d "$OUT_DIR" ] ; then + echo "$OUT_DIR" "does not exist, exiting" + exit 1 +fi + # auto detect MODTYPE from rootfs directory CNT=`grep -ic "Colibri.iMX6" rootfs/etc/issue || true` if [ "$CNT" -ge 1 ] ; then echo "Colibri iMX6 rootfs detected" MODTYPE=colibri-imx6 + # assumed minimal eMMC size [in sectors of 512] + EMMC_SIZE=$(expr 1024 \* 3500 \* 2) IMAGEFILE=root.ext3 - U_BOOT_BINARY=u-boot.imx - U_BOOT_BINARY_IT=u-boot.imx KERNEL_DEVICETREE="imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb" LOCPATH="imx_flash" - # assumed minimal eMMC size [in sectors of 512] - EMMC_SIZE=$(expr 1024 \* 3500 \* 2) + OUT_DIR="$OUT_DIR/colibri_imx6" + U_BOOT_BINARY=u-boot.imx + U_BOOT_BINARY_IT=u-boot.imx else CNT=`grep -ic "imx6" rootfs/etc/issue || true` if [ "$CNT" -ge 1 ] ; then echo "Apalis iMX6 rootfs detected" MODTYPE=apalis-imx6 + # assumed minimal eMMC size [in sectors of 512] + EMMC_SIZE=$(expr 1024 \* 3500 \* 2) IMAGEFILE=root.ext3 - U_BOOT_BINARY=u-boot.imx - U_BOOT_BINARY_IT=u-boot-it.imx KERNEL_DEVICETREE="imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \ imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb " LOCPATH="imx_flash" - # assumed minimal eMMC size [in sectors of 512] - EMMC_SIZE=$(expr 1024 \* 3500 \* 2) + OUT_DIR="$OUT_DIR/apalis_imx6" + U_BOOT_BINARY=u-boot.imx + U_BOOT_BINARY_IT=u-boot-it.imx else echo "can not detect module type from ./rootfs/etc/issue" echo "exiting" @@ -136,12 +144,6 @@ if [ "$UBOOT_RECOVERY" -ge 1 ] ; then exit 1 fi -# is OUT_DIR an existing directory? -if [ ! -d "$OUT_DIR" ] ; then - echo "$OUT_DIR" "does not exist, exiting" - exit 1 -fi - #sanity check for awk programs AWKTEST=`echo 100000000 | awk -v min=100 -v f=10000 '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` || true [ "${AWKTEST}x" = "204x" ] || { echo >&2 "Program awk not available. Aborting."; exit 1; } @@ -183,6 +185,8 @@ basename "`readlink -e ${BINARIES}/uImage`" >> ${BINARIES}/versions.txt $ECHO -n "Rootfs " >> ${BINARIES}/versions.txt grep -i imx6 rootfs/etc/issue >> ${BINARIES}/versions.txt +#create subdirectory for this module type +sudo mkdir -p "$OUT_DIR" # The emmc layout used is: # @@ -271,6 +275,9 @@ sudo $LOCPATH/genext3fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || #copy to $OUT_DIR sudo cp ${BINARIES}/${U_BOOT_BINARY} ${BINARIES}/${U_BOOT_BINARY_IT} ${BINARIES}/uImage ${BINARIES}/mbr.bin ${BINARIES}/boot.vfat \ ${BINARIES}/${IMAGEFILE} ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR" +sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img" +sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img" +sudo cp ${BINARIES}/fwd_mmc.img "$OUT_DIR/../flash_mmc.img" #cleanup intermediate files sudo rm ${BINARIES}/mbr.bin ${BINARIES}/boot.vfat ${BINARIES}/${IMAGEFILE} ${BINARIES}/versions.txt diff --git a/recipes/images/files/library/tegra/update.sh b/recipes/images/files/library/tegra/update.sh index dfe531f..92ddb27 100755 --- a/recipes/images/files/library/tegra/update.sh +++ b/recipes/images/files/library/tegra/update.sh @@ -128,6 +128,12 @@ if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then exit 0 fi +# is OUT_DIR an existing directory? +if [ ! -d "$OUT_DIR" ] ; then + echo "$OUT_DIR" "does not exist, exiting" + exit 1 +fi + # auto detect MODTYPE from rootfs directory CNT=`grep -ic "apalis" rootfs/etc/issue || true` if [ "$CNT" -ge 1 ] ; then @@ -135,16 +141,17 @@ if [ "$CNT" -ge 1 ] ; then if [ "$CNT" -ge 1 ] ; then echo "Apalis T30 rootfs detected" MODTYPE=apalis-t30 - IMAGEFILE=root.ext3 - U_BOOT_BINARY=u-boot-dtb-tegra.bin - KERNEL_DEVICETREE="tegra30-apalis-eval.dtb" - LOCPATH="tegra-uboot-flasher" - # assumed minimal eMMC size [in sectors of 512] - EMMC_SIZE=$(expr 1024 \* 7450 \* 2) # BCT=apalis_t30_12MHz_MT41K512M8RH-125_533MHz.bct BCT=Apalis_T30_2GB_800Mhz.bct CBOOT_IMAGE=apalis_t30.img CBOOT_IMAGE_TARGET=tegra30 + # assumed minimal eMMC size [in sectors of 512] + EMMC_SIZE=$(expr 1024 \* 7450 \* 2) + IMAGEFILE=root.ext3 + KERNEL_DEVICETREE="tegra30-apalis-eval.dtb" + LOCPATH="tegra-uboot-flasher" + OUT_DIR="$OUT_DIR/apalis_t30" + U_BOOT_BINARY=u-boot-dtb-tegra.bin else echo "can not detect module type from ./rootfs/etc/issue" echo "exiting" @@ -157,31 +164,33 @@ else if [ "$CNT" -ge 1 ] ; then echo "Colibri T20 rootfs detected" MODTYPE=colibri-t20 - IMAGEFILE=ubifs - U_BOOT_BINARY=u-boot-dtb-tegra.bin - KERNEL_DEVICETREE="tegra20-colibri-eval-v3.dtb" - LOCPATH="tegra-uboot-flasher" BCT=colibri_t20-${RAM_SIZE}-${MODVERSION}-${BOOT_DEVICE}.bct CBOOT_IMAGE="colibri_t20-256-v11-nand.img colibri_t20-256-v12-nand.img colibri_t20-512-v11-nand.img colibri_t20-512-v12-nand.img" CBOOT_IMAGE_TARGET=tegra20 + EMMC_PARTS="" + IMAGEFILE=ubifs + KERNEL_DEVICETREE="tegra20-colibri-eval-v3.dtb" # zImage but from rootfs/boot KERNEL_IMAGETYPE="" - EMMC_PARTS="" + LOCPATH="tegra-uboot-flasher" + OUT_DIR="$OUT_DIR/colibri_t20" + U_BOOT_BINARY=u-boot-dtb-tegra.bin else CNT=`grep -ic "t30" rootfs/etc/issue || true` if [ "$CNT" -ge 1 ] ; then echo "Colibri T30 rootfs detected" MODTYPE=colibri-t30 - IMAGEFILE=root.ext3 - U_BOOT_BINARY=u-boot-dtb-tegra.bin - KERNEL_DEVICETREE="tegra30-colibri-eval-v3.dtb" - LOCPATH="tegra-uboot-flasher" - EMMC_SIZE=$(expr 1024 \* 2000 \* 2) # with new kernel, boot with 400MHz, then switch between 400 & 800 BCT=colibri_t30_12MHz_NT5CC256M16CP-DI_400MHz.bct # BCT=colibri_t30_12MHz_NT5CC256M16CP-DI_533MHz.bct CBOOT_IMAGE=colibri_t30.img CBOOT_IMAGE_TARGET=tegra30 + EMMC_SIZE=$(expr 1024 \* 2000 \* 2) + IMAGEFILE=root.ext3 + KERNEL_DEVICETREE="tegra30-colibri-eval-v3.dtb" + LOCPATH="tegra-uboot-flasher" + OUT_DIR="$OUT_DIR/colibri_t30" + U_BOOT_BINARY=u-boot-dtb-tegra.bin else echo "can not detect module type from ./rootfs/etc/issue" echo "exiting" @@ -225,12 +234,6 @@ if [ "$UBOOT_RECOVERY" -eq 1 ] ; then exit 1 fi -# is OUT_DIR an existing directory? -if [ ! -d "$OUT_DIR" ] ; then - echo "$OUT_DIR" "does not exist, exiting" - exit 1 -fi - #sanity check for awk programs AWKTEST=`echo 100000000 | awk -v min=100 -v f=10000 '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` || true [ "${AWKTEST}x" = "204x" ] || { echo >&2 "Program awk not available. Aborting."; exit 1; } @@ -289,6 +292,9 @@ fi $ECHO -n "Rootfs " >> ${BINARIES}/versions.txt grep -i t[2-3]0 rootfs/etc/issue >> ${BINARIES}/versions.txt +#create subdirectory for this module type +sudo mkdir -p "$OUT_DIR" + # The emmc layout used is: # # boot area partition 1 aka primary eMMC boot sector: @@ -400,6 +406,9 @@ fi OUT_DIR=`readlink -f $OUT_DIR` cd ${BINARIES} sudo cp ${CBOOT_IMAGE} ${KERNEL_IMAGETYPE} ${EMMC_PARTS} ${IMAGEFILE}* flash*.img versions.txt "$OUT_DIR" +sudo cp fwd_blk.img "$OUT_DIR/../flash_blk.img" +sudo cp fwd_eth.img "$OUT_DIR/../flash_eth.img" +sudo cp fwd_mmc.img "$OUT_DIR/../flash_mmc.img" #cleanup intermediate files sudo rm ${CBOOT_IMAGE} ${EMMC_PARTS} ${IMAGEFILE}* versions.txt cd .. -- cgit v1.2.3