summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/imx-base.inc2
-rw-r--r--conf/machine/include/mxs-base.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 799067d3..b0dca6a4 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -139,7 +139,7 @@ IMX_DEFAULT_KERNEL_mx6ul = "linux-imx"
139PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" 139PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
140 140
141SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" 141SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
142IMAGE_FSTYPES ?= "ext3 sdcard" 142IMAGE_FSTYPES ?= "ext3 sdcard.gz"
143 143
144SERIAL_CONSOLE = "115200 ttymxc0" 144SERIAL_CONSOLE = "115200 ttymxc0"
145 145
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index 38450be0..230b7761 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -36,7 +36,7 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
36KERNEL_IMAGETYPE = "zImage" 36KERNEL_IMAGETYPE = "zImage"
37 37
38SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" 38SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
39IMAGE_FSTYPES ?= "ext3 uboot.mxsboot-sdcard sdcard" 39IMAGE_FSTYPES ?= "ext3 uboot.mxsboot-sdcard sdcard.gz"
40 40
41# Add the ability to specify _imx machines 41# Add the ability to specify _imx machines
42MACHINEOVERRIDES =. "imx:" 42MACHINEOVERRIDES =. "imx:"