From f4f44556c7a64313a2c329511e56a3ca228d42d9 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 2 Jul 2015 13:23:39 +0200 Subject: configblock.bin: stop deploying skeleton configblock.bin U-Boot now has the command cfgblock which can be used to create a valid configblock. Alternatively one can be created with create_configblock.sh. --- .../files/apalis-imx6/apalis-imx6_bin/configblock.bin | Bin 32 -> 0 bytes .../files/apalis-t30/apalis-t30_bin/configblock.bin | Bin 32 -> 0 bytes .../files/colibri-imx6/colibri-imx6_bin/configblock.bin | Bin 32 -> 0 bytes .../colibri-t20/colibri-t20_bin/configblock_256.bin | Bin 2048 -> 0 bytes .../colibri-t20/colibri-t20_bin/configblock_512.bin | Bin 2048 -> 0 bytes .../files/colibri-t30/colibri-t30_bin/configblock.bin | Bin 32 -> 0 bytes .../files/colibri-vf/colibri-vf_bin/configblock.bin | Bin 2048 -> 0 bytes recipes/images/files/colibri-vf/update.sh | 7 +++++-- recipes/images/files/library/imx6/update.sh | 2 +- 9 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 recipes/images/files/apalis-imx6/apalis-imx6_bin/configblock.bin delete mode 100644 recipes/images/files/apalis-t30/apalis-t30_bin/configblock.bin delete mode 100644 recipes/images/files/colibri-imx6/colibri-imx6_bin/configblock.bin delete mode 100644 recipes/images/files/colibri-t20/colibri-t20_bin/configblock_256.bin delete mode 100644 recipes/images/files/colibri-t20/colibri-t20_bin/configblock_512.bin delete mode 100644 recipes/images/files/colibri-t30/colibri-t30_bin/configblock.bin delete mode 100644 recipes/images/files/colibri-vf/colibri-vf_bin/configblock.bin diff --git a/recipes/images/files/apalis-imx6/apalis-imx6_bin/configblock.bin b/recipes/images/files/apalis-imx6/apalis-imx6_bin/configblock.bin deleted file mode 100644 index f1f39ab..0000000 Binary files a/recipes/images/files/apalis-imx6/apalis-imx6_bin/configblock.bin and /dev/null differ diff --git a/recipes/images/files/apalis-t30/apalis-t30_bin/configblock.bin b/recipes/images/files/apalis-t30/apalis-t30_bin/configblock.bin deleted file mode 100644 index cba3a26..0000000 Binary files a/recipes/images/files/apalis-t30/apalis-t30_bin/configblock.bin and /dev/null differ diff --git a/recipes/images/files/colibri-imx6/colibri-imx6_bin/configblock.bin b/recipes/images/files/colibri-imx6/colibri-imx6_bin/configblock.bin deleted file mode 100644 index ab8f1f7..0000000 Binary files a/recipes/images/files/colibri-imx6/colibri-imx6_bin/configblock.bin and /dev/null differ diff --git a/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_256.bin b/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_256.bin deleted file mode 100644 index 35068f7..0000000 Binary files a/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_256.bin and /dev/null differ diff --git a/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_512.bin b/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_512.bin deleted file mode 100644 index b58dbaa..0000000 Binary files a/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_512.bin and /dev/null differ diff --git a/recipes/images/files/colibri-t30/colibri-t30_bin/configblock.bin b/recipes/images/files/colibri-t30/colibri-t30_bin/configblock.bin deleted file mode 100644 index bd184b7..0000000 Binary files a/recipes/images/files/colibri-t30/colibri-t30_bin/configblock.bin and /dev/null differ diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/configblock.bin b/recipes/images/files/colibri-vf/colibri-vf_bin/configblock.bin deleted file mode 100644 index 9998f4b..0000000 Binary files a/recipes/images/files/colibri-vf/colibri-vf_bin/configblock.bin and /dev/null differ diff --git a/recipes/images/files/colibri-vf/update.sh b/recipes/images/files/colibri-vf/update.sh index 78dc852..a05df47 100755 --- a/recipes/images/files/colibri-vf/update.sh +++ b/recipes/images/files/colibri-vf/update.sh @@ -28,13 +28,16 @@ Flash() echo "script with the -d option. This will copy U-Boot into the module's RAM and" echo "and execute it. Also bridge RTS/CTS when using the evaluation boards USB to" echo "UART converter." + echo "Then use the following commands to get a working U-Boot." echo "" echo "\"./update.sh -n -d /dev/ttyUSB0\"" echo "" echo "Next, recreate the Boot Configuration Block and the Toradex Config Block" echo "" + echo "# run setupdate" + echo "# run update_uboot" echo "# run create_bcb" - echo "# run update_configblock" + echo "# cfgblock create" } Usage() @@ -176,7 +179,7 @@ $ECHO -n "Rootfs " >> ${BINARIES}/versions.txt grep VF rootfs/etc/issue >> ${BINARIES}/versions.txt #copy to $OUT_DIR -sudo cp ${BINARIES}/configblock.bin ${BINARIES}/u-boot-nand.imx ${BINARIES}/ubifs.img ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR" +sudo cp ${BINARIES}/u-boot-nand.imx ${BINARIES}/ubifs.img ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR" sync echo "Successfully copied data to target folder." echo "" diff --git a/recipes/images/files/library/imx6/update.sh b/recipes/images/files/library/imx6/update.sh index 2ff097e..773e812 100755 --- a/recipes/images/files/library/imx6/update.sh +++ b/recipes/images/files/library/imx6/update.sh @@ -262,7 +262,7 @@ sudo $LOCPATH/genext3fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || #copy to $OUT_DIR -sudo cp ${BINARIES}/configblock.bin ${BINARIES}/${U_BOOT_BINARY} ${BINARIES}/${U_BOOT_BINARY_IT} ${BINARIES}/uImage ${BINARIES}/mbr.bin ${BINARIES}/boot.vfat \ +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" sync -- cgit v1.2.3