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>

2 files changed, 4 insertions, 3 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 32c83e91..92959ee2 100644
--- 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
index 11b90492..601b9340 100644
--- 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