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
diff --git a/conf/distro/openbmc-phosphor.conf b/conf/distro/openbmc-phosphor.conf
index 9f8bad2..924e119 100644
--- a/conf/distro/openbmc-phosphor.conf
+++ b/conf/distro/openbmc-phosphor.conf
@@ -56,3 +56,5 @@
KERNEL_FEATURES_append = " phosphor-gpio-keys"
KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys"
+
+IMAGE_CLASSES_append = " image_types_phosphor"
diff --git a/conf/machine/include/obmc-bsp-common.inc b/conf/machine/include/obmc-bsp-common.inc
index f4649e3..03e73b3 100644
--- a/conf/machine/include/obmc-bsp-common.inc
+++ b/conf/machine/include/obmc-bsp-common.inc
@@ -10,12 +10,9 @@
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"