diff options
Diffstat (limited to 'meta-ibm/recipes-phosphor/fans')
21 files changed, 252 insertions, 25 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf index ce7824ccb..ce7824ccb 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf index 98cb60288..98cb60288 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index dfe220935..2c15e034a 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1,8 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_witherspoon = "file://config.json" -SRC_URI_rainier = "file://rainier-2u/config.json \ +SRC_URI_p10bmc = "file://rainier-2u/config.json \ file://rainier-4u/config.json \ + file://rainier-1s4u/config.json \ file://everest/config.json \ " @@ -11,12 +12,14 @@ do_install_witherspoon() { install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ } -do_install_rainier() { +do_install_p10bmc() { # Install Rainier-2U/4U fan monitor config files install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/ + install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/ install -m 0644 ${WORKDIR}/rainier-2u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/ install -m 0644 ${WORKDIR}/rainier-4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/ + install -m 0644 ${WORKDIR}/rainier-1s4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/ # Install Everest fan monitor config file install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/ @@ -26,7 +29,8 @@ do_install_rainier() { FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json" FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_remove_rainier = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" +FILES_${PN}_remove_p10bmc = "${monitor_datadir}/monitor.yaml" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json index 74bcfc425..74bcfc425 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json new file mode 100644 index 000000000..737cb3f3b --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json @@ -0,0 +1,90 @@ +{ + "fans": [ + { + "inventory": "/system/chassis/motherboard/fan0", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan0_0", + "has_target": true + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan1", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan1_0", + "has_target": true + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan2", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan2_0", + "has_target": true + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan4", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan4_0", + "has_target": true + } + ] + } + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 2, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json index 145e37f38..145e37f38 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json index 71a489944..71a489944 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index efbdea1f3..2306ee509 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -1,8 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_witherspoon = "file://config.json" -SRC_URI_rainier = "file://rainier-2u/config.json \ +SRC_URI_p10bmc = "file://rainier-2u/config.json \ file://rainier-4u/config.json \ + file://rainier-1s4u/config.json \ file://everest/config.json \ " @@ -10,12 +11,14 @@ do_install_witherspoon() { install -d ${D}/${datadir}/phosphor-fan-presence/presence/ install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ } -do_install_rainier() { +do_install_p10bmc() { # Install Rainier-2U/4U fan presence config files install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/ + install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/ install -m 0644 ${WORKDIR}/rainier-2u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/ install -m 0644 ${WORKDIR}/rainier-4u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/ + install -m 0644 ${WORKDIR}/rainier-1s4u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/ # Install Everest fan presence config file install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,everest/ @@ -25,7 +28,8 @@ do_install_rainier() { FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json" FILES_${PN}_remove_witherspoon = "${presence_datadir}/config.yaml" -FILES_${PN}_remove_rainier = "${presence_datadir}/config.yaml" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json" +FILES_${PN}_remove_p10bmc = "${presence_datadir}/config.yaml" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json index 439aedcac..439aedcac 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json new file mode 100644 index 000000000..5bcda88b3 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json @@ -0,0 +1,86 @@ +[ + { + "name": "fan0", + "path": "/system/chassis/motherboard/fan0", + "methods": [ + { + "type": "gpio", + "key": 6, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan0_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan1", + "path": "/system/chassis/motherboard/fan1", + "methods": [ + { + "type": "gpio", + "key": 7, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan1_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan2", + "path": "/system/chassis/motherboard/fan2", + "methods": [ + { + "type": "gpio", + "key": 8, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan2_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan4", + "path": "/system/chassis/motherboard/fan4", + "methods": [ + { + "type": "gpio", + "key": 10, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan4_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json index 726451028..726451028 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json index 94e7e69f8..94e7e69f8 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json index 0e4e4d05a..0e4e4d05a 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json index 2edfb3680..2edfb3680 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json index 1480aa30f..1480aa30f 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json 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 new file mode 100644 index 000000000..a04270076 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/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": "fan4", + "zone": "0", + "sensors": ["fan4_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json index b2c96070b..b2c96070b 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json index 54d3f28ca..54d3f28ca 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json 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 new file mode 100644 index 000000000..b2c96070b --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json @@ -0,0 +1,9 @@ +[ + { + "name": "0", + "full_speed": 6000, + "default_floor": 6000, + "increase_delay": 5, + "decrease_interval": 30 + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json index 10465a909..10465a909 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 3d6829a2d..7de421656 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -34,16 +34,16 @@ SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf: SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service @@ -61,43 +61,51 @@ EXTRA_OECONF_append_witherspoon = " --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" -PACKAGECONFIG_append_rainier = " json sensor-monitor" -FAN_PACKAGES_append_rainier = " sensor-monitor" -RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config" -RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" +PACKAGECONFIG_append_p10bmc = " json sensor-monitor" +FAN_PACKAGES_append_p10bmc = " sensor-monitor" +RDEPENDS_${PN}-presence-tach_append_p10bmc = " phosphor-fan-presence-config" +RDEPENDS_${PN}-monitor_append_p10bmc = " phosphor-fan-monitor-config" # Install fan control JSON config files -SRC_URI_append_rainier = " \ +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_rainier() { +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_rainier = " \ +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" |