obmc-bsp-common: Build default eMMC images
OpenBMC only supported 2 layouts: static and UBI. With the
introduction of eMMC, need to change the logic so that
static images are only built if UBI or eMMC are not
specified. Add the default eMMC image types to be built.
Tested: Adding this line to a machine conf only built the
wic image and emmc tarball:
require conf/distro/include/phosphor-mmc.inc
(From meta-phosphor rev: 2f1584b1bec3047944544cfeb5c5539e307f0ecb)
Change-Id: I45569ab375221ac8b9cb7bb045ca88e71cad7286
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index 4bafeaf..8a3da11 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -5,10 +5,23 @@
KERNEL_CLASSES ?= "kernel-fitimage"
KERNEL_IMAGETYPES ?= "fitImage"
+# Static images. This is the default if no other layout is specified.
+IMAGE_FSTYPES += "${@bb.utils.contains_any('DISTRO_FEATURES', \
+ 'obmc-ubi-fs phosphor-mmc', \
+ '', \
+ 'mtd-static mtd-static-tar mtd-static-alltar', d)}"
+
+# UBI images.
IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
'obmc-ubi-fs', \
'mtd-ubi mtd-ubi-tar', \
- 'mtd-static mtd-static-tar mtd-static-alltar', d)}"
+ '', d)}"
+
+# eMMC images.
+IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
+ 'phosphor-mmc', \
+ 'wic.xz mmc-ext4-tar', \
+ '', d)}"
INITRAMFS_CTYPE ?= "xz"
INITRAMFS_FSTYPES = "cpio.${INITRAMFS_CTYPE}"