diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-09 00:04:00 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-12 22:51:39 -0400 |
| commit | 8623bbe4d4a187018cc3c265aaca5fa05b78d13b (patch) | |
| tree | 92566fed6a5d963b24658f634c1cce40841c8d01 /meta-phosphor/conf/machine/include/obmc-bsp-common.inc | |
| parent | 250a984fc21fa6de8ae7723d59409815758b7825 (diff) | |
| download | talos-openbmc-8623bbe4d4a187018cc3c265aaca5fa05b78d13b.tar.gz talos-openbmc-8623bbe4d4a187018cc3c265aaca5fa05b78d13b.zip | |
Convert obmc-ubi-fs to a distro feature
As with MRW the use of the UBI image scheme is distro policy.
Convert the existing machine feature to a distro feature.
Enable the new distro feature on the systems that use
it(Witherspoon).
Add a distro override and fix-up MF checks to use this override
instead for improved readability.
Tested: Built a Witherspoon image and validated image
Change-Id: I8ab03115bbfc2ecc77cff5c9eb8628903ae88051
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/conf/machine/include/obmc-bsp-common.inc')
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 165eca422..2cbdd89d4 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -11,7 +11,7 @@ UBOOT_SUFFIX ?= "bin" MACHINEOVERRIDES =. "openbmc:" IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" -IMAGE_FSTYPES += "${@bb.utils.contains('MACHINE_FEATURES', \ +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \ 'obmc-ubi-fs', \ 'mtd-ubi mtd-ubi-tar', \ 'mtd-static mtd-static-tar mtd-static-alltar', d)}" @@ -19,8 +19,8 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" INITRAMFS_CTYPE ?= "lzma" INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}" -INITRAMFS_IMAGE = "${@bb.utils.contains('MACHINE_FEATURES', \ - 'obmc-ubi-fs', '', 'obmc-phosphor-initramfs', d)}" +INITRAMFS_IMAGE ?= "obmc-phosphor-initramfs" +INITRAMFS_IMAGE_df-obmc-ubi-fs ?= "" MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" |
