summaryrefslogtreecommitdiffstats
path: root/conf/machine/include/imx-base.inc
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r--conf/machine/include/imx-base.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index e1b7895d..4c7071b6 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -222,8 +222,8 @@ IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
222 222
223PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" 223PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
224 224
225SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz" 225SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz"
226SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard sdcard.gz" 226SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.gz"
227 227
228SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" 228SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4"
229IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" 229IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
@@ -240,8 +240,7 @@ WKS_FILE_DEPENDS ?= " \
240 e2fsprogs-native \ 240 e2fsprogs-native \
241 bmap-tools-native \ 241 bmap-tools-native \
242" 242"
243 243WKS_FILE ?= "imx-uboot-bootpart.wks"
244SOC_DEFAULT_IMAGE_FSTYPES_mx25 = "wic.gz"
245 244
246SERIAL_CONSOLE = "115200 ttymxc0" 245SERIAL_CONSOLE = "115200 ttymxc0"
247SERIAL_CONSOLE_mxs = "115200 ttyAMA0" 246SERIAL_CONSOLE_mxs = "115200 ttyAMA0"