diff options
author | Matthew Barth <msbarth@us.ibm.com> | 2021-08-19 18:55:57 +0300 |
---|---|---|
committer | Matthew Barth <msbarth@linux.ibm.com> | 2021-09-13 18:39:16 +0300 |
commit | 9a6d1185cfd782e326292705330e69566e3bfa7d (patch) | |
tree | b8cbf6db0019ae0ee6d1acafcf5d66258dacf5ce | |
parent | 810504de6665d0c48040787c7bbd52d1c90ee0cc (diff) | |
download | openbmc-9a6d1185cfd782e326292705330e69566e3bfa7d.tar.xz |
meta-ibm:fans:control: Use JSON config files installed from repo
The `p10bmc` machine's JSON config files should now use the JSON config
files installed from the repository.
Change-Id: Ibd9bbc055e4d00a5f799a291e9fd3a9955d774c5
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
9 files changed, 0 insertions, 172 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json deleted file mode 100644 index 0e4e4d05ab..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "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/p10bmc/everest/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json deleted file mode 100644 index 2edfb36809..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 10700, - "default_floor": 10700, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json deleted file mode 100644 index 1480aa30f3..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "power_on_delay": 15 -} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json deleted file mode 100644 index a04270076c..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "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": "fan4", - "zone": "0", - "sensors": ["fan4_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json deleted file mode 100644 index 006f45fd8d..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 10000, - "default_floor": 10000, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json deleted file mode 100644 index 54d3f28ca6..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 11200, - "default_floor": 8000, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json deleted file mode 100644 index 006f45fd8d..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 10000, - "default_floor": 10000, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json deleted file mode 100644 index 10465a9090..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "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" - }, - { - "name": "fan4", - "zone": "0", - "sensors": ["fan4_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan5", - "zone": "0", - "sensors": ["fan5_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 aa1925b7f9..f9b26135fc 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -63,49 +63,6 @@ EXTRA_OECONF:append:witherspoon = " --disable-json-control" PACKAGECONFIG:append:p10bmc = " json sensor-monitor" FAN_PACKAGES:append:p10bmc = " sensor-monitor" -# Install fan control JSON config files -SRC_URI:append:p10bmc = " \ - file://manager.json \ - file://rainier/fans.json \ - file://rainier-1s4u/fans.json \ - file://rainier-2u/zones.json \ - file://rainier-4u/zones.json \ - file://rainier-1s4u/zones.json \ - file://everest/fans.json \ - file://everest/zones.json" -do_install:append:p10bmc() { - # Install fan control manager config file - install -d ${D}/${datadir}/phosphor-fan-presence/control/ - install -m 0644 ${WORKDIR}/manager.json ${D}/${datadir}/phosphor-fan-presence/control/ - - # 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/ - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - install -m 0644 ${WORKDIR}/rainier-2u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/ - install -m 0644 ${WORKDIR}/rainier-4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/ - install -m 0644 ${WORKDIR}/rainier-1s4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - - # Install Everest fan config files - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest - install -m 0644 ${WORKDIR}/everest/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ - install -m 0644 ${WORKDIR}/everest/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ -} -FILES:${PN}-control:append:p10bmc = " \ - ${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,rainier-1s4u/zones.json \ - ${datadir}/phosphor-fan-presence/control/ibm,everest/fans.json \ - ${datadir}/phosphor-fan-presence/control/ibm,everest/zones.json" - # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service # file that's used for witherspoon type(including witherspoon-tacoma) machines SYSTEMD_SUBSTITUTIONS:witherspoon = "ADDR:100:phosphor-fan-control@.service" |