diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 7 | ||||
-rw-r--r-- | wic/imx-uboot-bootpart.wks.in (renamed from wic/imx-uboot-bootpart.wks) | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 5f19e043..bef8d6ce 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}" | |||
14 | 14 | ||
15 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" | 15 | PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" |
16 | 16 | ||
17 | UBOOT_BINARY ?= "u-boot.imx" | ||
17 | UBOOT_MAKE_TARGET ?= "u-boot.imx" | 18 | UBOOT_MAKE_TARGET ?= "u-boot.imx" |
18 | UBOOT_MAKE_TARGET_mxs ?= "u-boot.sb" | 19 | UBOOT_MAKE_TARGET_mxs ?= "u-boot.sb" |
19 | UBOOT_MAKE_TARGET_mx8 ?= "" | 20 | UBOOT_MAKE_TARGET_mx8 ?= "" |
@@ -301,7 +302,7 @@ WKS_FILE_DEPENDS ?= " \ | |||
301 | 302 | ||
302 | WKS_FILE_DEPENDS_mx8 += "imx-boot" | 303 | WKS_FILE_DEPENDS_mx8 += "imx-boot" |
303 | 304 | ||
304 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks" | 305 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" |
305 | SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" | 306 | SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" |
306 | SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" | 307 | SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" |
307 | 308 | ||
@@ -313,11 +314,11 @@ WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | |||
313 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" | 314 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" |
314 | UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" | 315 | UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" |
315 | SPL_BINARY_use-fsl-bsp_mx6 = "" | 316 | SPL_BINARY_use-fsl-bsp_mx6 = "" |
316 | WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks" | 317 | WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" |
317 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" | 318 | UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" |
318 | UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" | 319 | UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" |
319 | SPL_BINARY_use-fsl-bsp_mx7 = "" | 320 | SPL_BINARY_use-fsl-bsp_mx7 = "" |
320 | WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks" | 321 | WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" |
321 | 322 | ||
322 | SERIAL_CONSOLES = "115200;ttymxc0" | 323 | SERIAL_CONSOLES = "115200;ttymxc0" |
323 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" | 324 | SERIAL_CONSOLES_mxs = "115200;ttyAMA0" |
diff --git a/wic/imx-uboot-bootpart.wks b/wic/imx-uboot-bootpart.wks.in index a5e0137b..8fe019c0 100644 --- a/wic/imx-uboot-bootpart.wks +++ b/wic/imx-uboot-bootpart.wks.in | |||
@@ -12,7 +12,7 @@ | |||
12 | # | | | | | 12 | # | | | | |
13 | # 0 1kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 13 | # 0 1kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
14 | # | 14 | # |
15 | part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1 | 15 | part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 1 |
16 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16 | 16 | 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 | 17 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 |
18 | 18 | ||