diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-08 23:44:34 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-12 22:51:38 -0400 |
| commit | 250a984fc21fa6de8ae7723d59409815758b7825 (patch) | |
| tree | be7d036171dfa83a7bf7f78083ff1b98427f4ff6 /meta-openbmc-machines/meta-openpower/conf/machine | |
| parent | b81d4282120dc0c19e0f73833e12a9a5baa7a3a5 (diff) | |
| download | talos-openbmc-250a984fc21fa6de8ae7723d59409815758b7825.tar.gz talos-openbmc-250a984fc21fa6de8ae7723d59409815758b7825.zip | |
MRW: Use a distro override to enable providers
Now that obmc-mrw is no longer a machine feature we can organize
a bit and enable MRW providers off to the side with a disto override,
de-cluttering wherever non-MRW defaults are specified.
No functional impact but slightly easier for humans to parse.
Change-Id: If2731206b94e16e0b0132a385756eb11178118f2
Tested: Built a Witherspoon image and validated manifest
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/conf/machine')
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index b84be8753..a67b7f5f2 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -23,15 +23,12 @@ PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" -PREFERRED_PROVIDER_virtual/openpower-fru-inventory ?= \ - "${@df_enabled(d, 'obmc-mrw', 'openpower-fru-inventory-mrw-native', 'openpower-fru-inventory-example-native')}" -PREFERRED_PROVIDER_virtual/openpower-fru-properties ?= \ - "${@df_enabled(d, 'obmc-mrw', 'openpower-fru-properties-mrw-native', 'openpower-fru-properties-example-native')}" +PREFERRED_PROVIDER_virtual/openpower-fru-inventory ?= "openpower-fru-inventory-example-native" +PREFERRED_PROVIDER_virtual/openpower-fru-properties ?= "openpower-fru-properties-example-native" # The openpower-occ-control application is data-driven and requires an input # yaml of OCC instance numbers to sensor IDs. # This virtual is a native recipe that provides that mapping by installing # configuration files in the format and native sysroot location expected by # the openpower-occ-control build process in the native sysroot. -PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native ?= \ - "${@df_enabled(d, 'obmc-mrw', 'openpower-occ-control-config-mrw-native', 'openpower-occ-control-config-example-native')}" +PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native ?= "openpower-occ-control-config-example-native" |
