summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-witherspoon/conf
diff options
context:
space:
mode:
authorTom Joseph <tomjoseph@in.ibm.com>2018-09-24 15:34:14 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-09-26 20:25:35 +0300
commit6c09f7a1614f67835e46c088cd2061e41d1e1903 (patch)
tree48c314c6cbb63124be082e92d00a016c75873953 /meta-ibm/meta-witherspoon/conf
parentfe3486b5fd44de0aa55fd76a088a6ae6263ffedc (diff)
downloadopenbmc-6c09f7a1614f67835e46c088cd2061e41d1e1903.tar.xz
phosphor-ipmi-config: Refactor phosphor-ipmi-config provider
The phopshor-ipmi-config provider witherspoon-ipmi-config is removed to use the default configuration files. cipher_list.json and dcmi_cap.json for the witherspoon is the same as the default configuration file. dcmi_sensors.json, dev_id.json and power_reading.json is specific to witherspoon. do_patch populates the aux field in dev_id.json for witherspoon. (From meta-ibm rev: 5e794ec57243fd8aced04118d8f9fc90a5bbd3a4) Change-Id: Icd355780524b6104f89390dbe0017d2c667e963c Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon/conf')
-rw-r--r--meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf5
1 files changed, 0 insertions, 5 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
index 1ccd1cf5a..0b1776222 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -19,9 +19,6 @@ PHOSPHOR_MRW_REV = "6ca015dbd3e1e9d5206f9ec13ec9db2d8965e181"
# Inhibit phosphor-hwmon-config-mrw
VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
-# Pick up the Witherspoon-specific IPMI configuration
-VIRTUAL-RUNTIME_ipmi-config = "witherspoon-ipmi-config"
-
# Inhibit phosphor-fan-presence-mrw-native
PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
"phosphor-fan-presence-config-native"
@@ -29,5 +26,3 @@ 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-native"
-
-PREFERRED_RPROVIDER_virtual/phosphor-ipmi-config = "witherspoon-ipmi-config"