| commit | 1918a256bd71a0dd5c932db2da937e3f82d4acaf | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Mon Jul 10 22:40:30 2017 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Jul 13 22:33:02 2017 -0400 |
| tree | 5492de1791a5045d500985f6e93c164c35c3501b | |
| parent | 73b88dd6649a68d44505af64787c8b9cd8a583d5 [diff] |
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-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 69381da..e8eef10 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
@@ -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-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config%/config.yaml new file mode 100644 index 0000000..53e0f5e --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/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-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend new file mode 100644 index 0000000..72d991c --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend
@@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"