diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-12-10 02:03:10 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-01-14 04:41:49 +0300 |
| commit | e20e692f16c2d2ad59be61320fcc8bc7a52969c1 (patch) | |
| tree | 347717d60f21ce49278d5e462f9804cd59a10816 /meta-phosphor/conf | |
| parent | 65e6918d8d2a17526b393d33fca4844debccce79 (diff) | |
| download | openbmc-e20e692f16c2d2ad59be61320fcc8bc7a52969c1.tar.xz | |
meta-phosphor: split image type configs to includes
We have reached branch-capacity in the bb.utils.contains checks
at 3 image types. In order to be able to more easily add additional
image types, split the differences out into additional inc-snippets
for each image type.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ibcdb5c885c67cb6d8728dfd315eb07f99b1a2173
Diffstat (limited to 'meta-phosphor/conf')
4 files changed, 10 insertions, 18 deletions
diff --git a/meta-phosphor/conf/machine/include/image-type/mmc.inc b/meta-phosphor/conf/machine/include/image-type/mmc.inc new file mode 100644 index 0000000000..07d5db461a --- /dev/null +++ b/meta-phosphor/conf/machine/include/image-type/mmc.inc @@ -0,0 +1,2 @@ +IMAGE_FSTYPES += "wic.xz mmc-ext4-tar" +INITRAMFS_IMAGE = "obmc-phosphor-initramfs" diff --git a/meta-phosphor/conf/machine/include/image-type/static.inc b/meta-phosphor/conf/machine/include/image-type/static.inc new file mode 100644 index 0000000000..d714e1ba32 --- /dev/null +++ b/meta-phosphor/conf/machine/include/image-type/static.inc @@ -0,0 +1,2 @@ +IMAGE_FSTYPES += "mtd-static mtd-static-tar mtd-static-alltar" +INITRAMFS_IMAGE = "obmc-phosphor-initramfs" diff --git a/meta-phosphor/conf/machine/include/image-type/ubi-fs.inc b/meta-phosphor/conf/machine/include/image-type/ubi-fs.inc new file mode 100644 index 0000000000..62e66a6a39 --- /dev/null +++ b/meta-phosphor/conf/machine/include/image-type/ubi-fs.inc @@ -0,0 +1,2 @@ +IMAGE_FSTYPES += "mtd-ubi mtd-ubi-tar" +INITRAMFS_IMAGE = "" diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 9098a8a4ad..8a38343156 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -5,25 +5,11 @@ KERNEL_CLASSES ?= "kernel-fitimage" KERNEL_IMAGETYPES ?= "fitImage vmlinux" -# 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)}" +OBMC_IMAGE_INCLUDE = "static" +OBMC_IMAGE_INCLUDE:df-obmc-ubi-fs = "ubi-fs" +OBMC_IMAGE_INCLUDE:df-phosphor-mmc = "mmc" -# UBI images. -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \ - 'obmc-ubi-fs', \ - 'mtd-ubi mtd-ubi-tar', \ - '', d)}" - -# eMMC images. -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \ - 'phosphor-mmc', \ - 'wic.xz mmc-ext4-tar', \ - '', d)}" +require conf/machine/include/image-type/${OBMC_IMAGE_INCLUDE}.inc INITRAMFS_CTYPE ?= "xz" INITRAMFS_FSTYPES = "cpio.${INITRAMFS_CTYPE}" -INITRAMFS_IMAGE = "obmc-phosphor-initramfs" -INITRAMFS_IMAGE:df-obmc-ubi-fs = "" |