diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2017-02-01 11:02:06 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2017-02-01 11:05:40 -0200 |
commit | 389b8e5b33d17d6e1f31166b0539972a020cb1af (patch) | |
tree | e88ac7bc4ebaaad42cc85e46b2fc3947dd6eccb2 /conf/machine | |
parent | 816646509484561360350f83744e867dccfb7e5e (diff) | |
download | meta-freescale-389b8e5b33d17d6e1f31166b0539972a020cb1af.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>
Diffstat (limited to 'conf/machine')
-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 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" | |||
186 | SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz" | 186 | SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot.mxsboot-sdcard sdcard.gz" |
187 | 187 | ||
188 | SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" | 188 | SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" |
189 | IMAGE_FSTYPES ??= "${SOC_DEFAULT_IMAGE_FSTYPES}" | 189 | IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" |
190 | 190 | ||
191 | SERIAL_CONSOLE = "115200 ttymxc0" | 191 | SERIAL_CONSOLE = "115200 ttymxc0" |
192 | SERIAL_CONSOLE_mxs = "115200 ttyAMA0" | 192 | SERIAL_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" | |||
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" |