diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2017-01-16 16:22:11 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-01-17 09:31:38 -0200 |
commit | 022d7611ec0c76578ef90c3078849a4b9e91f483 (patch) | |
tree | c87b28e26279da7c0b6d26d8f1c7175bc3fddc9d | |
parent | 4855f210846351effa8f5507d20268120aaec354 (diff) | |
download | meta-freescale-022d7611ec0c76578ef90c3078849a4b9e91f483.tar.gz |
qoriq-base, imx-base: Allow DISTRO and local.conf override of IMAGE_FSTYPES
To allow the DISTRO and local.conf to override the IMAGE_FSTYPES value
we must provide a weak default (using the ??= operator) otherwise
machines need to play with the import order to override it.
Change-Id: I93407b8b6a93e5953bc4bae08f4ae4dafc5c6158
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | conf/machine/include/imx-base.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/qoriq-base.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 29677f24..6e6233d2 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -189,7 +189,7 @@ SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz" | |||
189 | SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz" | 189 | SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz" |
190 | 190 | ||
191 | SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" | 191 | SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" |
192 | IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" | 192 | IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}" |
193 | 193 | ||
194 | SERIAL_CONSOLE = "115200 ttymxc0" | 194 | SERIAL_CONSOLE = "115200 ttymxc0" |
195 | SERIAL_CONSOLE_mxs = "115200 ttyAMA0" | 195 | SERIAL_CONSOLE_mxs = "115200 ttyAMA0" |
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 6c25d50e..426d5118 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc | |||
@@ -12,7 +12,7 @@ PREFERRED_VERSION_testfloat = "2a" | |||
12 | IMAGE_CLASSES += "image_types_uboot" | 12 | IMAGE_CLASSES += "image_types_uboot" |
13 | 13 | ||
14 | SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz" | 14 | SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz" |
15 | IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" | 15 | IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}" |
16 | 16 | ||
17 | MACHINE_FEATURES ?= "pci ext2 ext3 serial" | 17 | MACHINE_FEATURES ?= "pci ext2 ext3 serial" |
18 | MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" | 18 | MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" |