diff options
author | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
---|---|---|
committer | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
commit | 2af35ee50ce9918ee3626c59f2cff62cd3ab9568 (patch) | |
tree | bcc218f953c63222bff793a788b7922b9e39fb88 /meta-ibm/conf | |
parent | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (diff) | |
parent | 9248c75b142fa11243c20f4d200a04e4f6395b51 (diff) | |
download | openbmc-2af35ee50ce9918ee3626c59f2cff62cd3ab9568.tar.xz |
Merge tag '1-0.91' of github.com:intel-innersource/firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-ibm/conf')
-rw-r--r-- | meta-ibm/conf/bblayers.conf.sample | 13 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon.conf | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/bblayers.conf.sample index 11b3f5980..4f70015be 100644 --- a/meta-ibm/conf/bblayers.conf.sample +++ b/meta-ibm/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-ibm \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security/meta-tpm \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ - " diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index 42844c1cc..e71992219 100644 --- a/meta-ibm/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -32,3 +32,5 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \ # Inhibit phosphor-fan-control-fan-config-mrw-native PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \ "phosphor-fan-control-fan-config" + +IMAGE_FEATURES:remove = "obmc-ikvm" |