diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-09-07 14:54:55 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-10-03 18:24:22 +0200 |
commit | 5ebd1a24f39225867b3dec6999d622ec5328888a (patch) | |
tree | 4f247b107fc004317c4522f08e702da637bc3ea9 /recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin | |
parent | 94f55f144a135c35c7cdef4fb49441861bfee844 (diff) |
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 <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin')
-rw-r--r-- | recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr | 10 | ||||
-rw-r--r-- | recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr index 63862d0..fd229a0 100644 --- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr +++ b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_blk.scr @@ -1,14 +1,14 @@ setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000' -setenv recreate_bcb 'nand read ${loadaddr} 0x800 0x800 && run create_bcb && nand write ${loadaddr} 0x800 0x800' +setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800' setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' setenv prepare_rootfs 'ubi create rootfs 0 dynamic' setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_kernel_fdt && && run prepare_rootfs; fi' -setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${loadaddr} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${loadaddr} u-boot2 ${filesize}' -setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' -setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/i${soc}ull-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' -setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' +setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}' +setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' +setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/i${soc}ull-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' +setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' diff --git a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr index a4b6cba..4028c42 100644 --- a/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr +++ b/recipes-images/images/files/colibri-imx6ull/colibri-imx6ull_bin/flash_eth.scr @@ -1,14 +1,14 @@ setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000' -setenv recreate_bcb 'nand read ${loadaddr} 0x800 0x800 && run create_bcb && nand write ${loadaddr} 0x800 0x800' +setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800' setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' setenv prepare_rootfs 'ubi create rootfs 0 dynamic' setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_kernel_fdt && && run prepare_rootfs; fi' -setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${loadaddr} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${loadaddr} u-boot2 ${filesize}' -setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' -setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/i${soc}ull-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' -setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' +setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}' +setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}' +setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/i${soc}ull-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}' +setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}' setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' |