summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-07-02 13:23:39 +0200
committerMax Krummenacher <max.oss.09@gmail.com>2015-10-12 15:15:41 +0200
commitbea36eb4e8afa9dea9c18a9b272755e8dd626ad4 (patch)
tree1d85ce61f717fdd0c671da94abd2b2902a54e889
parent7424dbe152295fb25b45d9f3a5066369279fe4cc (diff)
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.
-rw-r--r--recipes/images/files/apalis-imx6/apalis-imx6_bin/configblock.binbin32 -> 0 bytes
-rw-r--r--recipes/images/files/apalis-t30/apalis-t30_bin/configblock.binbin32 -> 0 bytes
-rw-r--r--recipes/images/files/colibri-imx6/colibri-imx6_bin/configblock.binbin32 -> 0 bytes
-rw-r--r--recipes/images/files/colibri-t20/colibri-t20_bin/configblock_256.binbin2048 -> 0 bytes
-rw-r--r--recipes/images/files/colibri-t20/colibri-t20_bin/configblock_512.binbin2048 -> 0 bytes
-rw-r--r--recipes/images/files/colibri-t30/colibri-t30_bin/configblock.binbin32 -> 0 bytes
-rw-r--r--recipes/images/files/colibri-vf/colibri-vf_bin/configblock.binbin2048 -> 0 bytes
-rwxr-xr-xrecipes/images/files/colibri-vf/update.sh7
-rwxr-xr-xrecipes/images/files/library/imx6/update.sh2
9 files changed, 6 insertions, 3 deletions
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
--- a/recipes/images/files/apalis-imx6/apalis-imx6_bin/configblock.bin
+++ /dev/null
Binary files 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
--- a/recipes/images/files/apalis-t30/apalis-t30_bin/configblock.bin
+++ /dev/null
Binary files 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
--- a/recipes/images/files/colibri-imx6/colibri-imx6_bin/configblock.bin
+++ /dev/null
Binary files 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
--- a/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_256.bin
+++ /dev/null
Binary files 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
--- a/recipes/images/files/colibri-t20/colibri-t20_bin/configblock_512.bin
+++ /dev/null
Binary files 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
--- a/recipes/images/files/colibri-t30/colibri-t30_bin/configblock.bin
+++ /dev/null
Binary files 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
--- a/recipes/images/files/colibri-vf/colibri-vf_bin/configblock.bin
+++ /dev/null
Binary files 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