summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-02-01 11:02:06 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2017-02-01 11:02:25 -0200
commite3b357ebe0dd677c662c7bf425134a6de289fc48 (patch)
treee7c5365ba31b09a94f0e7b6498f2ddd24800596f
parentb9e01a95ef57b067fb11d9b6b50cf2b4931d11d9 (diff)
downloadmeta-freescale-e3b357ebe0dd677c662c7bf425134a6de289fc48.tar.gz
Revert "qoriq-base, imx-base: Allow DISTRO and local.conf override of IMAGE_FSTYPES"
The IMAGE_FSTYPES is set in bitbake.conf as ?= so we cannot use the weak assingment here. This brings back the image generation using the standard set for the BSP but we will need to investigate a solution for the distro overriding issue. Change-Id: I57cda5eb894330ad857b0bca44a8a987dc06afb2 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-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"