diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
| commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
| tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-phosphor/conf/machine/include/obmc-bsp-common.inc | |
| parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
| parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
| download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz | |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/conf/machine/include/obmc-bsp-common.inc')
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 15 |
1 files changed, 14 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 4bafeafce..8a3da1199 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}" |