From 6edb67dcfc3b414e7f9e349ea31631b3e79a6c70 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Thu, 27 Jul 2017 14:16:40 -0500 Subject: 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 --- meta-phosphor/classes/image_types_phosphor.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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}" -- cgit v1.2.1