diff options
author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /meta-quanta/meta-gsj/conf | |
parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-quanta/meta-gsj/conf')
-rw-r--r-- | meta-quanta/meta-gsj/conf/layer.conf | 1 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/conf/machine/gsj.conf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index 7591e0953..372fb65da 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -8,3 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_gsj-layer = "hardknott honister" +LAYERDEPENDS_gsj-layer = "core phosphor-layer google-layer quanta-layer" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index c5089e804..ce58a91c3 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -11,7 +11,7 @@ require conf/machine/include/obmc-bsp-common.inc IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" IMAGE_FSTYPES += " mtd-ubi-tar" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ |