wspoon: Inhibit phosphor-fan-presence-mrw
Use a hardcoded config file for the Witherspoon
fan presence configuration.
Hopefully a somewhat temporary workaround of missing tags in the
Witherspoon MRW.
Change-Id: If702959012a3ac627e5fb3e3307f2ee79a9af3d0
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
index 69381da..e8eef10 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -17,3 +17,7 @@
# Inhibit phosphor-hwmon-config-mrw
VIRTUAL-RUNTIME_phosphor-hwmon-config = ""
+
+# Inhibit phosphor-fan-presence-mrw-native
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config = \
+ "phosphor-fan-presence-config-native"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml
new file mode 100644
index 0000000..53e0f5e
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml
@@ -0,0 +1,21 @@
+- Tach:
+ - PrettyName: fan2
+ Inventory: /system/chassis/motherboard/fan2
+ Description:
+ Sensors:
+ - fan2
+ - PrettyName: fan0
+ Inventory: /system/chassis/motherboard/fan0
+ Description:
+ Sensors:
+ - fan0
+ - PrettyName: fan1
+ Inventory: /system/chassis/motherboard/fan1
+ Description:
+ Sensors:
+ - fan1
+ - PrettyName: fan3
+ Inventory: /system/chassis/motherboard/fan3
+ Description:
+ Sensors:
+ - fan3
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend
new file mode 100644
index 0000000..72d991c
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"