commit dfd2dd23f2d80f03125a99c20a80f01f19f055a3
author Brad Bishop <bradleyb@fuzziesquirrel.com> Fri Aug 04 23:54:51 2017 -0400
committer Adriana Kobylak <anoo@us.ibm.com> Fri Aug 18 11:48:42 2017 -0500
tree f9cbc31c40142712b75e8384f4d42fc641a8857e
parent 3e62b0dafca79082bb312990475d7c52527d7a2f

Enable ubi image fstype with obmc-ubi-fs

Change-Id: I06f511350e025144a8612c8077427a1d35cdfe10
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

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

diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index 3c6bbc9..165eca4 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -10,7 +10,11 @@
 
 MACHINEOVERRIDES =. "openbmc:"
 
-IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot mtd-static mtd-static-tar mtd-static-alltar"
+IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot"
+IMAGE_FSTYPES += "${@bb.utils.contains('MACHINE_FEATURES', \
+        'obmc-ubi-fs', \
+        'mtd-ubi mtd-ubi-tar', \
+        'mtd-static mtd-static-tar mtd-static-alltar', d)}"
 OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils"
 
 INITRAMFS_CTYPE ?= "lzma"