From 3e62b0dafca79082bb312990475d7c52527d7a2f Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Thu, 27 Jul 2017 14:28:19 -0500 Subject: obmc-phosphor-image: remove initramfs if obmc-ubi-fs enabled Change-Id: Ie064ea9595742b78ccb7fe8a59c923b147ebfff6 Signed-off-by: Patrick Williams --- meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 63c5e1ab9..3c6bbc97c 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -15,7 +15,8 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" INITRAMFS_CTYPE ?= "lzma" INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}" -INITRAMFS_IMAGE = "obmc-phosphor-initramfs" +INITRAMFS_IMAGE = "${@bb.utils.contains('MACHINE_FEATURES', \ + 'obmc-ubi-fs', '', 'obmc-phosphor-initramfs', d)}" MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" -- cgit v1.2.1