diff options
| -rw-r--r-- | conf/machine/include/imx-base.inc | 2 | ||||
| -rw-r--r-- | files/wic/imx-imx-boot-bootpart.wks.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 916db91cf..ffda91768 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -682,6 +682,8 @@ SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" | |||
| 682 | SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" | 682 | SOC_DEFAULT_WKS_FILE:mx9-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" |
| 683 | 683 | ||
| 684 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 684 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |
| 685 | IMX_BOOTLOADER_PTABLE ?= "msdos" | ||
| 686 | IMX_BOOTLOADER_PTABLE:use-nxp-bsp ?= "gpt" | ||
| 685 | 687 | ||
| 686 | SERIAL_CONSOLES = "115200;ttymxc0" | 688 | SERIAL_CONSOLES = "115200;ttymxc0" |
| 687 | SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" | 689 | SERIAL_CONSOLES:mxs-generic-bsp = "115200;ttyAMA0" |
diff --git a/files/wic/imx-imx-boot-bootpart.wks.in b/files/wic/imx-imx-boot-bootpart.wks.in index 46a2a0a68..02a7c95c3 100644 --- a/files/wic/imx-imx-boot-bootpart.wks.in +++ b/files/wic/imx-imx-boot-bootpart.wks.in | |||
| @@ -17,4 +17,4 @@ part u-boot --source rawcopy --sourceparams="file=imx-boot.tagged" --ondisk mmcb | |||
| 17 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --fixed-size 256 | 17 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --fixed-size 256 |
| 18 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192 | 18 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192 |
| 19 | 19 | ||
| 20 | bootloader --ptable msdos | 20 | bootloader --ptable ${IMX_BOOTLOADER_PTABLE} |
