diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-03-24 00:34:45 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-03-25 23:23:32 +0300 |
| commit | a8887be7c73cd111d2daf23611981fccfc504300 (patch) | |
| tree | 101a966b5e022a8fd92cbf1a6e27a48d2005baff /meta-ibm/recipes-phosphor/fans | |
| parent | 1053e1e17894b4a683198552bd38c5b939c0e75d (diff) | |
| download | openbmc-a8887be7c73cd111d2daf23611981fccfc504300.tar.xz | |
1s4u: support fans.json for new system
The 1s4u is just like the 2s4u except it has two less fans.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I35333e49c883fb9ac8c84223545fe3b903a66d7d
Diffstat (limited to 'meta-ibm/recipes-phosphor/fans')
| -rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json | 26 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | 4 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json new file mode 100644 index 000000000..0e4e4d05a --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json @@ -0,0 +1,26 @@ +[ + { + "name": "fan0", + "zone": "0", + "sensors": ["fan0_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan1", + "zone": "0", + "sensors": ["fan1_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan2", + "zone": "0", + "sensors": ["fan2_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan3", + "zone": "0", + "sensors": ["fan3_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 3d6829a2d..d84b8b822 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -70,6 +70,7 @@ RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" SRC_URI_append_rainier = " \ file://manager.json \ file://rainier/fans.json \ + file://rainier-1s4u/fans.json \ file://rainier-2u/zones.json \ file://rainier-4u/zones.json \ file://everest/fans.json \ @@ -81,7 +82,9 @@ do_install_append_rainier() { # Install Rainier-2U/4U fan config files install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier + install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u install -m 0644 ${WORKDIR}/rainier/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier/ + install -m 0644 ${WORKDIR}/rainier-1s4u/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/ @@ -96,6 +99,7 @@ do_install_append_rainier() { FILES_${PN}-control_append_rainier = " \ ${datadir}/phosphor-fan-presence/control/manager.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier/fans.json \ + ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/zones.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/zones.json \ ${datadir}/phosphor-fan-presence/control/ibm,everest/fans.json \ |