summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2017-07-27 14:16:40 -0500
committerAdriana Kobylak <anoo@us.ibm.com>2017-08-18 11:48:41 -0500
commit6edb67dcfc3b414e7f9e349ea31631b3e79a6c70 (patch)
tree1a8dc0c0f5104e2f16388bb01814083251634f30
parent750516194dbede8a42ff80ed64d993f9fb95bdb0 (diff)
downloadtalos-openbmc-6edb67dcfc3b414e7f9e349ea31631b3e79a6c70.tar.gz
talos-openbmc-6edb67dcfc3b414e7f9e349ea31631b3e79a6c70.zip
image-overlay: select fitimage based on obmc-ubi-fs
When the obmc-ubi-fs feature is enabled we should use the raw Linux kernel fitImage rather than the kernel+initramfs. Update image-overlay to select based on the MACHINE_FEATURE. Change-Id: I099e37c7f82218a2a7173de93724301b9a499bd3 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-rw-r--r--meta-phosphor/classes/image_types_phosphor.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass
index 565e43c73..21febe73d 100644
--- a/meta-phosphor/classes/image_types_phosphor.bbclass
+++ b/meta-phosphor/classes/image_types_phosphor.bbclass
@@ -18,7 +18,9 @@ inherit ${IMAGE_TYPE_uboot}
# The reference BMC software update implementation.
# Image composition
-FLASH_KERNEL_IMAGE ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}.bin"
+FLASH_KERNEL_IMAGE ?= "${@bb.utils.contains('MACHINE_FEATURES', \
+ 'obmc-ubi-fs', 'fitImage-${MACHINE}.bin', \
+ 'fitImage-${INITRAMFS_IMAGE}-${MACHINE}.bin', d)}"
IMAGE_BASETYPE ?= "squashfs-xz"
OVERLAY_BASETYPE ?= "jffs2"
FLASH_UBI_BASETYPE ?= "${IMAGE_BASETYPE}"
OpenPOWER on IntegriCloud