diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-07-27 14:28:19 -0500 |
|---|---|---|
| committer | Adriana Kobylak <anoo@us.ibm.com> | 2017-08-18 11:48:41 -0500 |
| commit | 3e62b0dafca79082bb312990475d7c52527d7a2f (patch) | |
| tree | 7fb224505c5d723455f864f55a9819394defd5eb | |
| parent | 6edb67dcfc3b414e7f9e349ea31631b3e79a6c70 (diff) | |
| download | talos-openbmc-3e62b0dafca79082bb312990475d7c52527d7a2f.tar.gz talos-openbmc-3e62b0dafca79082bb312990475d7c52527d7a2f.zip | |
obmc-phosphor-image: remove initramfs if obmc-ubi-fs enabled
Change-Id: Ie064ea9595742b78ccb7fe8a59c923b147ebfff6
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 3 |
1 files changed, 2 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 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" |
