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>

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 934bf628bfcdec7ab2110d300a68a2cdc7fd080b..06b81253a40ff580747f5930c79dd89f451e9669 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -186,7 +186,7 @@ SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz"
 SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz"
 
 SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4"
-IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}"
+IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 SERIAL_CONSOLE_mxs = "115200 ttyAMA0"

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 426d51187f2ffc4d40daf4d7ee2b253abc4f1f2f..6c25d50e7cc110280d9f15620794be758fa95b72 100644 (file)
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -12,7 +12,7 @@ PREFERRED_VERSION_testfloat = "2a"
 IMAGE_CLASSES += "image_types_uboot"
 
 SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz"
-IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}"
+IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 
 MACHINE_FEATURES ?= "pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules"