summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/conf/machine
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-08-04 23:54:51 -0400
committerAdriana Kobylak <anoo@us.ibm.com>2017-08-18 11:48:42 -0500
commitdfd2dd23f2d80f03125a99c20a80f01f19f055a3 (patch)
treef9cbc31c40142712b75e8384f4d42fc641a8857e /meta-phosphor/conf/machine
parent3e62b0dafca79082bb312990475d7c52527d7a2f (diff)
downloadtalos-openbmc-dfd2dd23f2d80f03125a99c20a80f01f19f055a3.tar.gz
talos-openbmc-dfd2dd23f2d80f03125a99c20a80f01f19f055a3.zip
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>
Diffstat (limited to 'meta-phosphor/conf/machine')
-rw-r--r--meta-phosphor/conf/machine/include/obmc-bsp-common.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index 3c6bbc97c..165eca422 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 @@ UBOOT_SUFFIX ?= "bin"
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"
OpenPOWER on IntegriCloud