diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-08 22:29:25 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-13 02:51:06 +0000 |
| commit | b81d4282120dc0c19e0f73833e12a9a5baa7a3a5 (patch) | |
| tree | d33cc40d5b2395efc9992026440c50d1d4c74026 /meta-openbmc-machines/meta-openpower/conf/machine | |
| parent | 3f94605e3a2ba3b89a8a4a8d3ee8946c15ec7b85 (diff) | |
| download | talos-openbmc-b81d4282120dc0c19e0f73833e12a9a5baa7a3a5.tar.gz talos-openbmc-b81d4282120dc0c19e0f73833e12a9a5baa7a3a5.zip | |
Remove obmc-mrw machine feature
Using MRW or not is distro policy. As such remove the obmc-mrw
machine feature.
Do not enable the remaining obmc-mrw distro feature in the base
phosphor distro configuration.
Create new distro configs for the systems that use MRW today
(i.e. Witherspoon) that enables the obmc-mrw distro feature and point
the local.conf.sample at the new distro configuration.
Change-Id: If4cedc745b3ee942518fbfd4d5cf2cd5b60f346d
Tested: Built a Witherspoon image and validate the 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 | 6 |
1 files changed, 3 insertions, 3 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 cbabdbe74..b84be8753 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -24,9 +24,9 @@ PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_wo 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 ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'openpower-fru-inventory-mrw-native', 'openpower-fru-inventory-example-native')}" + "${@df_enabled(d, 'obmc-mrw', 'openpower-fru-inventory-mrw-native', 'openpower-fru-inventory-example-native')}" PREFERRED_PROVIDER_virtual/openpower-fru-properties ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'openpower-fru-properties-mrw-native', 'openpower-fru-properties-example-native')}" + "${@df_enabled(d, 'obmc-mrw', 'openpower-fru-properties-mrw-native', '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. @@ -34,4 +34,4 @@ PREFERRED_PROVIDER_virtual/openpower-fru-properties ?= \ # 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 ?= \ - "${@cf_enabled(d, 'obmc-mrw', 'openpower-occ-control-config-mrw-native', 'openpower-occ-control-config-example-native')}" + "${@df_enabled(d, 'obmc-mrw', 'openpower-occ-control-config-mrw-native', 'openpower-occ-control-config-example-native')}" |
