commit 0fdcb44b4a7766ea81ff208ef16310e5b4ccac0a
author Patrick Williams <patrick@stwcx.xyz> Thu Jul 27 14:28:19 2017 -0500
committer Adriana Kobylak <anoo@us.ibm.com> Fri Aug 18 11:48:41 2017 -0500
tree 15bdad69efb069232ccbda7c3979336bb576068d
parent 0ad95d5128e2a0f4935eb51fb0d3e1334c0f8985

obmc-phosphor-image: remove initramfs if obmc-ubi-fs enabled

Change-Id: Ie064ea9595742b78ccb7fe8a59c923b147ebfff6
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

conf/machine/include/obmc-bsp-common.inc

diff --git a/conf/machine/include/obmc-bsp-common.inc b/conf/machine/include/obmc-bsp-common.inc
index 63c5e1a..3c6bbc9 100644
--- a/conf/machine/include/obmc-bsp-common.inc
+++ b/conf/machine/include/obmc-bsp-common.inc
@@ -15,7 +15,8 @@
 
 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"