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.

5 files changed, 9 insertions, 7 deletions

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