diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 2 | ||||
-rw-r--r-- | wic/imx-imx-boot-bootpart.wks.in (renamed from wic/imx-imx-boot-bootpart.wks) | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index ea7da2c2..cc420788 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -305,7 +305,7 @@ WKS_FILE_DEPENDS ?= " \ | |||
305 | WKS_FILE_DEPENDS_mx8 += "imx-boot" | 305 | WKS_FILE_DEPENDS_mx8 += "imx-boot" |
306 | 306 | ||
307 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks" | 307 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks" |
308 | SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks" | 308 | SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" |
309 | SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" | 309 | SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" |
310 | 310 | ||
311 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 311 | 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 @@ | |||
10 | # - ---------- -------------- -------------- | 10 | # - ---------- -------------- -------------- |
11 | # ^ ^ ^ ^ | 11 | # ^ ^ ^ ^ |
12 | # | | | | | 12 | # | | | | |
13 | # 0 33kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 13 | # 0 | 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
14 | # ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual | ||
14 | # | 15 | # |
15 | part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align 33 | 16 | part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK} |
16 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16 | 17 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16 |
17 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 | 18 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 |
18 | 19 | ||