From 5ebd1a24f39225867b3dec6999d622ec5328888a Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Thu, 7 Sep 2017 14:54:55 +0200 Subject: flash_blk/eth.scr: replace loadaddr by fdt_addr_r Unfortunately as loadaddr is equal to fdt_addr_r on some modules and equal to kernel_addr_r on others using it together with any of the others may cause issues. Therefore no longer make use of loadaddr and consistently use fdt_addr_r instead. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- .../colibri-t20/colibri-t20_bin/flash_eth.scr | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr') diff --git a/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr b/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr index bc4360d..7f4cbb4 100644 --- a/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr +++ b/recipes-images/images/files/colibri-t20/colibri-t20_bin/flash_eth.scr @@ -1,27 +1,27 @@ test -n ${hw-version} || if test $lnxoffset = 0x1200000; then setenv hw-version v11; else setenv hw-version v12; fi -setenv check_configblock 'setexpr toradex_oui_addr $loadaddr + 8; nand read $loadaddr 0x300000 0x64; crc32 -v $toradex_oui_addr 3 94305232' +setenv check_configblock 'setexpr toradex_oui_addr $fdt_addr_r + 8; nand read $fdt_addr_r 0x300000 0x64; crc32 -v $toradex_oui_addr 3 94305232' -setenv migrate_1 'nand read $loadaddr 0x15C0000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $loadaddr 0x300000 0x64' -setenv migrate_2 'nand read $loadaddr 0x1C80000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $loadaddr 0x300000 0x64' -setenv migrate_3 'nand read $loadaddr 0x7380000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $loadaddr 0x300000 0x64' -setenv migrate_4 'nand read $loadaddr 0x7900000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $loadaddr 0x300000 0x64' -setenv migrate_configblock 'setexpr toradex_oui_addr $loadaddr + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4' +setenv migrate_1 'nand read $fdt_addr_r 0x15C0000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' +setenv migrate_2 'nand read $fdt_addr_r 0x1C80000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' +setenv migrate_3 'nand read $fdt_addr_r 0x7380000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' +setenv migrate_4 'nand read $fdt_addr_r 0x7900000 0x40; crc32 -v $toradex_oui_addr 3 94305232 && nand erase.part cfgblock && nand write $fdt_addr_r 0x300000 0x64' +setenv migrate_configblock 'setexpr toradex_oui_addr $fdt_addr_r + 8; run migrate_1; run migrate_2; run migrate_3; run migrate_4' # Migrate to UBI volume based boot schema setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' setenv prepare_rootfs 'ubi create rootfs - dynamic' setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' -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}/${board_name}-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${loadaddr} 0x0 ${filesize}' +setenv update_configblock 'tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && nand erase.part cfgblock && nand write ${fdt_addr_r} cfgblock ${filesize}' +setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/${board_name}-${ram-size}-${hw-version}-nand.img && nand erase 0x0 0x300000 && nand write ${fdt_addr_r} 0x0 ${filesize}' -setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs_${leb-size}.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' -setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' +setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs_${leb-size}.img && run prepare_rootfs && ubi write ${fdt_addr_r} rootfs ${filesize}' +setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' #Writting data to invalidate current device tree -setenv update_fdt 'mw.w ${loadaddr} 0xFF 16 && ubi write ${loadaddr} dtb 16 && tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && -ubi write ${loadaddr} dtb ${filesize}' -setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs_${leb-size}.img && ubi write ${loadaddr} rootfs ${filesize}' +setenv update_fdt 'mw.w ${fdt_addr_r} 0xFF 16 && ubi write ${fdt_addr_r} dtb 16 && tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && +ubi write ${fdt_addr_r} dtb ${filesize}' +setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs_${leb-size}.img && ubi write ${fdt_addr_r} 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' -- cgit v1.2.3