diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-07-22 21:49:25 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-01 22:02:12 +0300 |
| commit | 97cce000ece7fbe9b1fcebd8b265e978f826fff5 (patch) | |
| tree | 75d1a0335d1c31ab2d5cb424679fa22f2228845d /meta-phosphor/conf | |
| parent | 8bf414ab205abd0e38261558d03861868cef3d8d (diff) | |
| download | openbmc-97cce000ece7fbe9b1fcebd8b265e978f826fff5.tar.xz | |
overlay: remove OBMC_PHOSPHOR_IMAGE_OVERLAY
Solve the problem resulting in the addition of this variable
differently, such that it can be removed and image type
selection can be selected in the standard way using IMAGE_FSTYPES.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: Ice94e8f278f00b8b4d344244bfb87dddeb173a23
Diffstat (limited to 'meta-phosphor/conf')
| -rw-r--r-- | meta-phosphor/conf/distro/openbmc-phosphor.conf | 2 | ||||
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 9f8bad2bba..924e119e21 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -56,3 +56,5 @@ OLDEST_KERNEL = "2.6.32" KERNEL_FEATURES_append = " phosphor-gpio-keys" KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys" + +IMAGE_CLASSES_append = " image_types_phosphor" diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index f4649e38a7..03e73b3403 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -10,12 +10,9 @@ UBOOT_SUFFIX ?= "bin" MACHINEOVERRIDES =. "openbmc:" -OBMC_PHOSPHOR_IMAGE_OVERLAY= "1" -IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" +IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot overlay" OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" -IMAGE_CLASSES += "image_types_uboot" - INITRAMFS_CTYPE ?= "lzma" INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}" INITRAMFS_IMAGE = "obmc-phosphor-initramfs" |