summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/imx-base.inc2
-rw-r--r--conf/machine/include/qoriq-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 934bf628..06b81253 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -186,7 +186,7 @@ SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz"
186SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz" 186SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz"
187 187
188SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" 188SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4"
189IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}" 189IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
190 190
191SERIAL_CONSOLE = "115200 ttymxc0" 191SERIAL_CONSOLE = "115200 ttymxc0"
192SERIAL_CONSOLE_mxs = "115200 ttyAMA0" 192SERIAL_CONSOLE_mxs = "115200 ttyAMA0"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 426d5118..6c25d50e 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -12,7 +12,7 @@ PREFERRED_VERSION_testfloat = "2a"
12IMAGE_CLASSES += "image_types_uboot" 12IMAGE_CLASSES += "image_types_uboot"
13 13
14SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz" 14SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz"
15IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}" 15IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
16 16
17MACHINE_FEATURES ?= "pci ext2 ext3 serial" 17MACHINE_FEATURES ?= "pci ext2 ext3 serial"
18MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" 18MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules"