imx-imx-boot-bootpart.wks: change default offset of bootloader

The i.MX 8QXP bootrom in B0 silicon reads the 1st image container at offset 32k
while tha A0 silicon started at 33k. The machine configurations already contain
the variable IMX_BOOT_SEEK to specify the needed offset.

Change the wks file accordingly.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index ea7da2c26c6fe1f0b6f7ad22800aefa1e1e760c7..cc4207888099c1186b75d2a8a70aba6d4693dbf2 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -305,7 +305,7 @@ WKS_FILE_DEPENDS ?= " \
 WKS_FILE_DEPENDS_mx8 += "imx-boot"
 
 SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks"
-SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks"
+SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in"
 SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
 
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"

diff --git a/wic/imx-imx-boot-bootpart.wks b/wic/imx-imx-boot-bootpart.wks.in
similarity index 82%
rename from wic/imx-imx-boot-bootpart.wks
rename to wic/imx-imx-boot-bootpart.wks.in
index 11b90492b949f5915674fc745ac800b8f2dffe99..601b934001f21977537f5a578f4b87f6aad76b91 100644 (file)
--- a/wic/imx-imx-boot-bootpart.wks
+++ b/wic/imx-imx-boot-bootpart.wks.in
@@ -10,9 +10,10 @@
 #  - ---------- -------------- --------------
 # ^ ^          ^              ^
 # | |          |              |
-# 0 33kiB    4MiB          16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+# 0 |        4MiB          16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#   ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
 #
-part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align 33
+part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
 part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096