diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2016-02-11 13:58:06 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-03-14 14:26:29 +0100 |
| commit | bda8bae5eae62ce0fa108756b4434c3eacc1729e (patch) | |
| tree | b403e7f705f3c28c3b566cf1d3a75310dcad03ed | |
| parent | c7e984e39d0a4826de403d50c3ba84a7a9d884e0 (diff) | |
colibri-imx7: flashing scipts: use new U-Boot implementation
e.g. look for files in ${board} subdirectory rather than in the media's root.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
3 files changed, 8 insertions, 9 deletions
diff --git a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr index eb6509c..996b0d4 100644 --- a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr +++ b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_blk.scr @@ -1,8 +1,8 @@ -setenv create_bcb 'nand erase.part mx7-bcb && writebcb 0x20000 0x20000' -setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' +setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' +setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' -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_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' setenv update 'mtdparts default; run update_uboot; run update_rootfs; reset' diff --git a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr index 4f81a85..1a24aa5 100644 --- a/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr +++ b/recipes/images/files/colibri-imx7/colibri-imx7_bin/flash_eth.scr @@ -1,8 +1,8 @@ -setenv create_bcb 'nand erase.part mx7-bcb && writebcb 0x20000 0x20000' -setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' +setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' +setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' setenv prepare_rootfs 'ubi part ubi && ubi check rootfs || ubi create rootfs' -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_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && run prepare_rootfs && ubi write ${loadaddr} rootfs ${filesize}' setenv update 'mtdparts default; run update_uboot; run update_rootfs; reset' diff --git a/recipes/images/files/colibri-imx7/update.sh b/recipes/images/files/colibri-imx7/update.sh index 205d437..68567f2 100755 --- a/recipes/images/files/colibri-imx7/update.sh +++ b/recipes/images/files/colibri-imx7/update.sh @@ -30,7 +30,7 @@ Flash() echo "execute it." echo "" echo "Then use the following command to get U-Boot running:" - echo "'./update.sh -n -d /dev/ttyUSB0'" + echo "'./update.sh -d'" echo "" echo "Next, recreate the Boot Configuration Block and the Toradex Config Block:" echo "'run setupdate'" @@ -70,10 +70,9 @@ PAGE=2KiB BLOCK=124KiB MAXLEB=8112 -while getopts "d:fhno:s" Option ; do +while getopts "dfhno:s" Option ; do case $Option in d) UBOOT_RECOVERY=1 - UARTDEV=$OPTARG ;; f) Flash exit 0 |