diff options
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
3 files changed, 10 insertions, 9 deletions
diff --git a/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-mrw.inc b/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-mrw.inc index c8dcdaaff..87f0fbf19 100644 --- a/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-mrw.inc +++ b/meta-openbmc-machines/meta-openpower/conf/distro/include/openpower-mrw.inc @@ -1 +1,5 @@ require conf/distro/include/phosphor-mrw.inc + +PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw ?= "openpower-fru-inventory-mrw-native" +PREFERRED_PROVIDER_virtual/openpower-fru-properties_df-mrw ?= "openpower-fru-properties-mrw-native" +PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native_df-mrw ?= "openpower-occ-control-config-mrw-native" 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" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index 0085a1476..5d2f25f90 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -24,12 +24,12 @@ DISTRO_FEATURES_append = " \ " # Inhibit phosphor-hwmon-config-mrw -VIRTUAL-RUNTIME_phosphor-hwmon-config = "" +VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" # Inhibit phosphor-fan-presence-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ "phosphor-fan-presence-config-native" # Inhibit phosphor-fan-control-fan-config-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ "phosphor-fan-control-fan-config-native" |
