summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor/conf/machine/include/obmc-bsp-common.inc')
-rw-r--r--meta-phosphor/conf/machine/include/obmc-bsp-common.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index 165eca422..2cbdd89d4 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -11,7 +11,7 @@ UBOOT_SUFFIX ?= "bin"
MACHINEOVERRIDES =. "openbmc:"
IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot"
-IMAGE_FSTYPES += "${@bb.utils.contains('MACHINE_FEATURES', \
+IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
'obmc-ubi-fs', \
'mtd-ubi mtd-ubi-tar', \
'mtd-static mtd-static-tar mtd-static-alltar', d)}"
@@ -19,8 +19,8 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils"
INITRAMFS_CTYPE ?= "lzma"
INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}"
-INITRAMFS_IMAGE = "${@bb.utils.contains('MACHINE_FEATURES', \
- 'obmc-ubi-fs', '', 'obmc-phosphor-initramfs', d)}"
+INITRAMFS_IMAGE ?= "obmc-phosphor-initramfs"
+INITRAMFS_IMAGE_df-obmc-ubi-fs ?= ""
MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"
OpenPOWER on IntegriCloud