diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-06-20 14:06:54 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-06-24 15:22:18 -0500 |
| commit | 205469475226853ec068be3c75819d745c3d0ccf (patch) | |
| tree | a1aecb9568d21b9ff2fd465e64b0f21a1b083192 /meta-phosphor/conf/machine/include/obmc-bsp-common.inc | |
| parent | d9cd4a0b4683d9054b4985013f6b2232ef8740f0 (diff) | |
| download | talos-openbmc-205469475226853ec068be3c75819d745c3d0ccf.tar.gz talos-openbmc-205469475226853ec068be3c75819d745c3d0ccf.zip | |
meta-phosphor: Make image-overlay an optional feature
Previously, obmc-bsp-common.inc added "overlay" to the IMAGE_FSTYPES
but this only has meaning if the 'image-overlay' class is used. The
obmc-phosphor-image class explicitly includes 'image-overlay' when
appropriate but no other images (ie. ones that come with yocto) do.
Changed obmc-bsp-common to instead enable an obmc-phosphor-image feature
by setting OBMC_PHOSPHOR_IMAGE_OVERLAY=1. Then in obmc-phosphor-image we
add "overlay" to the IMAGE_FSTYPES only when the feature is enabled.
This will fix both non-phosphor images on hardware platforms and all images
on simulation platforms.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-phosphor/conf/machine/include/obmc-bsp-common.inc')
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 2 |
1 files changed, 1 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 8d1fd7ef5..2b6a1632b 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -13,7 +13,7 @@ UBOOT_SUFFIX ?= "bin" MACHINEOVERRIDES =. "openbmc:" -IMAGE_FSTYPES += "overlay" +OBMC_PHOSPHOR_IMAGE_OVERLAY= "1" IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" |
