diff options
Diffstat (limited to 'meta-ibm/recipes-phosphor')
53 files changed, 665 insertions, 205 deletions
diff --git a/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend b/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend new file mode 100644 index 000000000..48fc87a54 --- /dev/null +++ b/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend @@ -0,0 +1,2 @@ +PACKAGECONFIG_append_rainier = " ibm-hypervisor-cert" +PACKAGECONFIG_append_witherspoon-tacoma = " ibm-hypervisor-cert" diff --git a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml index 419b9c86f..a5d8d648e 100644 --- a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml @@ -68,7 +68,7 @@ cpucore_temp_sensor: Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 mutability: Mutability::Write|Mutability::Read offsetB: -127 @@ -110,7 +110,7 @@ dimm_temp_sensor: Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 mutability: Mutability::Write|Mutability::Read offsetB: -127 @@ -188,7 +188,7 @@ gpu_temp_sensor: Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 mutability: Mutability::Write|Mutability::Read offsetB: -127 @@ -221,7 +221,7 @@ memory_temp_sensor: Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 mutability: Mutability::Write|Mutability::Read offsetB: -127 @@ -327,7 +327,7 @@ vrm_vdd_temp_sensor: Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 mutability: Mutability::Write|Mutability::Read offsetB: -127 diff --git a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml index 1cf747856..abfb83019 100644 --- a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml @@ -7,7 +7,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan0_0 @@ -28,7 +28,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan1_0 @@ -49,7 +49,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan2_0 @@ -70,7 +70,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan3_0 @@ -91,7 +91,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan4_0 @@ -112,7 +112,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan5_0 @@ -133,7 +133,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan0_1 @@ -154,7 +154,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan1_1 @@ -175,7 +175,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan2_1 @@ -196,7 +196,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan3_1 @@ -217,7 +217,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan4_1 @@ -238,7 +238,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan5_1 @@ -259,7 +259,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p0_vdd_power @@ -280,7 +280,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p1_vdd_power @@ -301,7 +301,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/ps0_input_power @@ -322,7 +322,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/ps1_input_power @@ -343,7 +343,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage @@ -364,7 +364,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage @@ -385,7 +385,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/current/ps0_output_current @@ -406,7 +406,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/current/ps1_output_current @@ -427,7 +427,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 20 offsetB: 0 path: /xyz/openbmc_project/sensors/power/total_power @@ -448,7 +448,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 30 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/p0_pcie_temp @@ -469,7 +469,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 30 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/p1_pcie_temp @@ -490,7 +490,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 20 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/ambient_temp diff --git a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml index 38f38355a..13bd92bb3 100644 --- a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml @@ -7,7 +7,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan0_0 @@ -28,7 +28,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan1_0 @@ -49,7 +49,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan2_0 @@ -70,7 +70,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan3_0 @@ -91,7 +91,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/fan_disk_power @@ -112,7 +112,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p0_io_power @@ -133,7 +133,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p1_io_power @@ -154,7 +154,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p0_mem_power @@ -175,7 +175,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p1_mem_power @@ -196,7 +196,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p0_power @@ -217,7 +217,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p1_power @@ -238,7 +238,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/power/ps0_input_power @@ -259,7 +259,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/power/ps1_input_power @@ -280,7 +280,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 20 offsetB: 0 path: /xyz/openbmc_project/sensors/power/total_power @@ -301,7 +301,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage @@ -322,7 +322,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage @@ -343,7 +343,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage @@ -364,7 +364,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage @@ -385,7 +385,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/current/ps0_output_current @@ -406,7 +406,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/current/ps1_output_current @@ -427,7 +427,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 30 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/pcie0_1 @@ -448,7 +448,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 30 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/pcie2_3 @@ -469,7 +469,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 20 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/ambient0 diff --git a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml index 803ed77ad..f22158b99 100644 --- a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml @@ -7,7 +7,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan0_0 @@ -28,7 +28,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan1_0 @@ -49,7 +49,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan2_0 @@ -70,7 +70,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan3_0 @@ -91,7 +91,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/fan_disk_power @@ -112,7 +112,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p0_io_power @@ -133,7 +133,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p1_io_power @@ -154,7 +154,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p0_mem_power @@ -175,7 +175,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p1_mem_power @@ -196,7 +196,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p0_power @@ -217,7 +217,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/power/p1_power @@ -238,7 +238,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/power/ps0_input_power @@ -259,7 +259,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/power/ps1_input_power @@ -280,7 +280,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 20 offsetB: 0 path: /xyz/openbmc_project/sensors/power/total_power @@ -301,7 +301,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage @@ -322,7 +322,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 2 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage @@ -343,7 +343,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps0_output_voltage @@ -364,7 +364,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 10 offsetB: 0 path: /xyz/openbmc_project/sensors/voltage/ps1_output_voltage @@ -385,7 +385,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/current/ps0_output_current @@ -406,7 +406,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 1 offsetB: 0 path: /xyz/openbmc_project/sensors/current/ps1_output_current @@ -427,7 +427,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 30 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/pcie @@ -448,7 +448,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 20 offsetB: 0 path: /xyz/openbmc_project/sensors/temperature/ambient @@ -469,7 +469,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan0_1 @@ -490,7 +490,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan1_1 @@ -511,7 +511,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan2_1 @@ -532,7 +532,7 @@ Value: Offsets: 255: - type: int64_t + type: double multiplierM: 100 offsetB: 0 path: /xyz/openbmc_project/sensors/fan_tach/fan3_1 diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index 60c33347c..0c632a151 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -1 +1,2 @@ -EXTRA_OECONF += " --enable-ibm-dbus-interfaces" +OBMC_ORG_YAML_SUBDIRS_append_witherspoon = " com/ibm" +OBMC_ORG_YAML_SUBDIRS_append_rainier = " com/ibm" diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/pels b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/pels new file mode 100644 index 000000000..2ad4ab0ea --- /dev/null +++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/pels @@ -0,0 +1,14 @@ +#!/bin/bash +# +# config: 23 20 +# +# 23 = User dump(2), elog dump(3) +# 20 = priority + +# @brief: Collect the PEL files + +. $DREPORT_INCLUDE/functions + +dir="/var/lib/phosphor-logging/extensions/pels/logs" +desc="PEL Files" +add_copy_file "$dir" "$desc" diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index 814699c76..94f1b10a4 100644 --- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -1,14 +1,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -PACKAGECONFIG_append_witherspoon-128 = " host-dump-offload-pldm" PACKAGECONFIG_append_rainier = " host-dump-offload-pldm" PACKAGECONFIG_append_witherspoon-tacoma = " host-dump-offload-pldm" +PACKAGECONFIG_append_rainier = " openpower-dumps-extension" +PACKAGECONFIG_append_witherspoon-tacoma = " openpower-dumps-extension" + SRC_URI += "file://plugins.d/ibm_elogall" +SRC_URI += "file://plugins.d/pels" install_ibm_plugins() { install -m 0755 ${WORKDIR}/plugins.d/ibm_elogall ${D}${dreport_plugin_dir} + install -m 0755 ${WORKDIR}/plugins.d/pels ${D}${dreport_plugin_dir} } @@ -18,7 +22,18 @@ python link_ibm_plugins() { workdir = d.getVar('WORKDIR', True) script = os.path.join(workdir, 'plugins.d', 'ibm_elogall') install_dreport_user_script(script, d) + + script = os.path.join(workdir, 'plugins.d', 'pels') + install_dreport_user_script(script, d) } -do_install[postfuncs] += "install_ibm_plugins" -do_install[postfuncs] += "link_ibm_plugins" +#Install dump header script from dreport/ibm.d to dreport/include.d +install_dreport_header() { + install -d ${D}${dreport_include_dir} + install -m 0755 ${S}/tools/dreport.d/ibm.d/* ${D}${dreport_include_dir}/ +} + +IBM_INSTALL_POSTFUNCS = "install_ibm_plugins link_ibm_plugins" +IBM_INSTALL_POSTFUNCS_rainier += "install_dreport_header" + +do_install[postfuncs] += "${IBM_INSTALL_POSTFUNCS}" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml index 2efbb0c7d..721e99aca 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml @@ -174,6 +174,18 @@ groups: - /temperature/nvme21 - /temperature/nvme22 - /temperature/nvme23 + - name: zone0_250soc + description: Group of nvme temperature sensors for zone 0 + type: /xyz/openbmc_project/sensors + members: + - /temperature/250_soc0 + - /temperature/250_soc1 + - /temperature/250_soc2 + - /temperature/250_soc3 + - /temperature/250_soc4 + - /temperature/250_soc5 + - /temperature/250_soc6 + - /temperature/250_soc7 matches: - name: propertiesChanged parameters: @@ -582,6 +594,11 @@ events: property: name: Value type: int64_t + - name: zone0_250soc + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t triggers: - name: init method: getProperties @@ -838,3 +855,36 @@ events: delta: value: 5 type: uint64_t + # Speed changes based on 250soc temps + - name: set_net_increase_speed + groups: + - name: zone0_250soc + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 80000 + type: int64_t + factor: + value: 1000 + type: int64_t + delta: + value: 13 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_250soc + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 77000 + type: int64_t + factor: + value: 3000 + type: int64_t + delta: + value: 5 + type: uint64_t 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 8f2097cc1..cb29a7483 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1 +1,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI_witherspoon = "file://config.json" + +do_install_witherspoon() { + install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ + install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ +} + +FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json" +FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json new file mode 100644 index 000000000..5923ccc42 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json @@ -0,0 +1,121 @@ +{ + "fans": [ + { + "inventory": "/system/chassis/motherboard/fan0", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "sensors": [ + { + "name": "fan0_0", + "has_target": true + }, + { + "name": "fan0_1", + "has_target": false + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan1", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "sensors": [ + { + "name": "fan1_0", + "has_target": true + }, + { + "name": "fan1_1", + "has_target": false + } + ], + "condition": { + "name": "propertiesMatch", + "properties": [ + { + "object": "/xyz/openbmc_project/inventory/system/chassis", + "interface": "xyz.openbmc_project.Inventory.Decorator.CoolingType", + "property": { + "name": "WaterCooled", + "type": "bool", + "value": false + } + } + ] + } + }, + { + "inventory": "/system/chassis/motherboard/fan2", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "sensors": [ + { + "name": "fan2_0", + "has_target": true + }, + { + "name": "fan2_1", + "has_target": false + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan3", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "sensors": [ + { + "name": "fan3_0", + "has_target": true + }, + { + "name": "fan3_1", + "has_target": false + } + ] + } + ], + "sensor_trust_groups": [ + { + "class": "NonzeroSpeed", + "group": [ + { + "name": "fan0_1" + }, + { + "name": "fan1_1" + }, + { + "name": "fan2_1" + }, + { + "name": "fan3_1" + }, + { + "name": "fan0_0", + "in_trust": false + }, + { + "name": "fan1_0", + "in_trust": false + }, + { + "name": "fan2_0", + "in_trust": false + }, + { + "name": "fan3_0", + "in_trust": false + } + ] + } + ] +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml deleted file mode 100644 index 5db7966fa..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml +++ /dev/null @@ -1,73 +0,0 @@ -fans: - - inventory: /system/chassis/motherboard/fan0 - functional_delay: 5 - allowed_out_of_range_time: 30 - deviation: 15 - num_sensors_nonfunc_for_fan_nonfunc: 1 - sensors: - - name: fan0_0 - has_target: true - - name: fan0_1 - has_target: false - - - inventory: /system/chassis/motherboard/fan1 - functional_delay: 5 - allowed_out_of_range_time: 30 - deviation: 15 - num_sensors_nonfunc_for_fan_nonfunc: 1 - sensors: - - name: fan1_0 - has_target: true - - name: fan1_1 - has_target: false - # Create fan1 inventory & sensors on air cooled only - condition: - name: propertiesMatch - properties: - - object: /xyz/openbmc_project/inventory/system/chassis - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType - property: - name: WaterCooled - type: bool - value: false - - - inventory: /system/chassis/motherboard/fan2 - functional_delay: 5 - allowed_out_of_range_time: 30 - deviation: 15 - num_sensors_nonfunc_for_fan_nonfunc: 1 - sensors: - - name: fan2_0 - has_target: true - - name: fan2_1 - has_target: false - - - inventory: /system/chassis/motherboard/fan3 - functional_delay: 5 - allowed_out_of_range_time: 30 - deviation: 15 - num_sensors_nonfunc_for_fan_nonfunc: 1 - sensors: - - name: fan3_0 - has_target: true - - name: fan3_1 - has_target: false - -sensor_trust_groups: - - class: NonzeroSpeed - group: - # Include all _1 fans to determine trust - - name: fan0_1 - - name: fan1_1 - - name: fan2_1 - - name: fan3_1 - # Add all _0 fans to be included in trust result effects, - # but not in determining trust - - name: fan0_0 - in_trust: false - - name: fan1_0 - in_trust: false - - name: fan2_0 - in_trust: false - - name: fan3_0 - in_trust: false diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf index e72de888f..38a37cbd1 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf @@ -1,5 +1,3 @@ [Unit] #These overrides allow the fan watchdog to take over when this service dies OnFailure=fan-watchdog-monitor@%n.service -StartLimitIntervalSec=5 -StartLimitBurst=3 diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 10f3f2284..834768cee 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,3 +1,5 @@ +SRCREV = "8e1b382122fed73e788d44f3a67cecbfbcc6972e" + FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" # Package configuration @@ -56,8 +58,9 @@ FMT_CONTROL_PWRON_witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${IN SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it -EXTRA_OECONF_append_witherspoon = " --enable-json" +EXTRA_OECONF_append_witherspoon = " --enable-json --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" +RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service # file that's used for witherspoon type(including witherspoon-tacoma) machines diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 562679222..0fb880fac 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,3 +1,3 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname" +OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname" OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd" -OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" +OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller " diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index 8e4049eaa..a45f0487b 100644 --- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,6 @@ -EXTRA_OECMAKE_append = " \ - -DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE=ON \ +EXTRA_OEMESON_append = " \ + -Dinsecure-tftp-update=enabled \ + -Dibm-management-console=enabled \ " inherit obmc-phosphor-discovery-service diff --git a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb index 2281192fe..8ee9e33cd 100644 --- a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb +++ b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem" -SRCREV = "44cee319dd113335a7885a1ff63a287dc7706682" +SRCREV = "ba89a1ea570cb010c2e929ac11ada3714878ca7d" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 9572df9b0..791ae9880 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openbmc/ibm-logging" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "29c2ec6dd67df321662c906711ec95a4635b372f" +SRCREV = "aeaa374a6fa097b2359acfc4d694ed3ebe8eecaa" inherit autotools inherit pkgconfig @@ -16,10 +16,11 @@ inherit obmc-phosphor-systemd inherit phosphor-dbus-yaml DEPENDS += " \ - ibm-dbus-interfaces \ - phosphor-logging \ - nlohmann-json \ + ${PYTHON_PN}-pyyaml-native \ autoconf-archive-native \ + phosphor-dbus-interfaces \ + nlohmann-json \ + phosphor-logging \ sdbusplus \ " @@ -58,20 +59,10 @@ do_report(){ ${S}/create_error_reports.py \ -p ${D}/${datadir}/ibm-logging/policy.json \ - -y ${STAGING_DIR_NATIVE}${yaml_dir} \ + -y ${STAGING_DIR_TARGET}${yaml_dir} \ -e ${WORKDIR}/build/all_errors.json \ -x ${WORKDIR}/build/policy_crosscheck.txt } -addtask report - -#Collect all of the error YAML files into our recipe-sysroot-native dir. -do_report[depends] = " \ - ibm-logging:do_install \ - phosphor-logging-error-logs-native:do_populate_sysroot \ - phosphor-dbus-interfaces-native:do_populate_sysroot \ - openpower-dbus-interfaces-native:do_populate_sysroot \ - openpower-occ-control-native:do_populate_sysroot \ - openpower-debug-collector-native:do_populate_sysroot \ - " +addtask report after do_install diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 5c1d740ba..ac5e0b969 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1,3 +1,2 @@ -PACKAGECONFIG_append_witherspoon-128 = " openpower-pels" PACKAGECONFIG_append_witherspoon-tacoma = " openpower-pels" PACKAGECONFIG_append_rainier = " openpower-pels" diff --git a/meta-ibm/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-ibm/recipes-phosphor/network/first-boot-set-mac_%.bbappend deleted file mode 100644 index fc8f6b861..000000000 --- a/meta-ibm/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " first-boot-set-mac@eth0.service" -SYSTEMD_SERVICE_${PN}_append_mihawk = " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service"
\ No newline at end of file diff --git a/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json new file mode 100644 index 000000000..52280a4e6 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +} diff --git a/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service index 890551e7a..890551e7a 100644 --- a/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service diff --git a/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json new file mode 100644 index 000000000..52280a4e6 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +} diff --git a/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service new file mode 100644 index 000000000..890551e7a --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json new file mode 100644 index 000000000..08bb92aed --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json @@ -0,0 +1,4 @@ +{ + "eth0":"ethernet0", + "eth1":"ethernet1" +} diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service new file mode 100644 index 000000000..890551e7a --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json new file mode 100644 index 000000000..9f535ca8f --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"eth0" +} diff --git a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service new file mode 100644 index 000000000..890551e7a --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend index bcb2d0136..150d373e6 100644 --- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,15 +1,34 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/network:" -SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service" -SRC_URI_append_mihawk = " file://ncsi-netlink.service" -SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service" -SYSTEMD_SERVICE_${PN}_append_mihawk = " ncsi-netlink.service" +SRC_URI += " file://ncsi-netlink.service" +SYSTEMD_SERVICE_${PN} += " ncsi-netlink.service" +FILES_${PN} += "${datadir}/network/*.json" -do_install_append_ibm-ac-server() { +EXTRA_OECONF += "--enable-sync-mac" + +install_network_configuration(){ install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} + install -d ${D}${datadir}/network/ + install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json +} + +SRC_URI_append_rainier = " file://inventory-object-map.json" +do_install_append_rainier(){ + install_network_configuration +} + +SRC_URI_append_ibm-ac-server = " file://inventory-object-map.json" +do_install_append_ibm-ac-server() { + install_network_configuration } + +SRC_URI_append_mihawk = " file://inventory-object-map.json" do_install_append_mihawk() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} + install_network_configuration +} + +SRC_URI_append_witherspoon-tacoma = " file://inventory-object-map.json" +do_install_append_witherspoon-tacoma(){ + install_network_configuration } diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index d03118488..7bd2dc285 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -24,15 +24,16 @@ RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-contr RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog" RDEPENDS_${PN}-fan-control_append_rainier = " fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" -RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem" +RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} webui-vue dbus-sensors phosphor-virtual-sensor" +RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue" + RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" -RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui" RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}" -RDEPENDS_${PN}-extras_append_rainier = " pldm" -RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm openpower-hw-diags" - -RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm" +RDEPENDS_${PN}-extras_append_rainier = " pldm openpower-hw-diags srvcfg-manager" +RDEPENDS_${PN}-leds_remove_rainier = "phosphor-led-manager-faultmonitor" +RDEPENDS_${PN}-leds_remove_witherspoon-tacoma = "phosphor-led-manager-faultmonitor" ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend deleted file mode 100644 index 03646adeb..000000000 --- a/meta-ibm/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -DEPENDS += "witherspoon-pfault-analysis-error-native" - diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 000000000..04f169deb --- /dev/null +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,3 @@ +DEVPATH=/sys/bus/i2c/devices/3-005b +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 000000000..af19bf20c --- /dev/null +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,3 @@ +DEVPATH=/sys/bus/i2c/devices/3-0058 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/pseq-monitor-pgood.service b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/pseq-monitor-pgood.service new file mode 100644 index 000000000..af748cbca --- /dev/null +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/pseq-monitor-pgood.service @@ -0,0 +1,13 @@ +[Unit] +Description=Power Sequencer Power-on Monitor +Wants=op-power-start@0.service +After=op-power-start@0.service +Wants=power-workarounds@0.service +After=power-workarounds@0.service +Conflicts=obmc-chassis-poweroff@0.target +ConditionPathExists=!/run/openbmc/chassis@0-on + +[Service] +Type=oneshot +ExecStart=/usr/bin/env pseq-monitor -a pgood-monitor -i 10000 +SyslogIdentifier=pseq-monitor diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/psu.json new file mode 100644 index 000000000..31ead8269 --- /dev/null +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/mihawk/psu.json @@ -0,0 +1,29 @@ +{ + "inventoryPMBusAccessType": "HwmonDeviceDebug", + "fruConfigs": [ + { + "propertyName": "PartNumber", + "fileName": "part_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "SerialNumber", + "fileName": "serial_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Model", + "fileName": "ccin", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Version", + "fileName": "fw_version", + "interface": "xyz.openbmc_project.Software.Version" + } + ], + "psuDevices": { + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-005b", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0058" + } +} diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 1105e0cf6..3c652cee9 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -4,9 +4,12 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON_append_ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON_append_rainier = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true" +EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld" -DEPENDS += " power-sequencer" +DEPENDS_append_ibm-ac-server = " power-sequencer" +DEPENDS_append_rainier = " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb index be5035eca..cd5822202 100644 --- a/meta-ibm/recipes-phosphor/power/power-sequencer.bb +++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb @@ -5,13 +5,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch -SRC_URI = "file://ucd90160.yaml" +SRC_URI_append_ibm-ac-server = " file://ucd90160.yaml" +SRC_URI_append_rainier = " file://ucd90160.yaml" -FILES_${PN} += "${datadir}/power-sequencer/ucd90160.yaml" +FILES_${PN}_append_ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml" +FILES_${PN}_append_rainier = " ${datadir}/power-sequencer/ucd90160.yaml" S = "${WORKDIR}" -do_install() { +do_install_append_ibm-ac-server() { + DEST=${D}${datadir}/power-sequencer + + install -D ucd90160.yaml ${DEST}/ucd90160.yaml +} + +do_install_append_rainier() { DEST=${D}${datadir}/power-sequencer install -D ucd90160.yaml ${DEST}/ucd90160.yaml diff --git a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 000000000..3f2661301 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_rainier = "hwmontempsensor" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@71/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@71/i2c@0/tmp431@4c.conf new file mode 100644 index 000000000..33463645b --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@71/i2c@0/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc0" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@71/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@71/i2c@1/tmp431@4c.conf new file mode 100644 index 000000000..60dafc672 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545@71/i2c@1/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc1" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf new file mode 100644 index 000000000..1cad7deb8 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc2" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf new file mode 100644 index 000000000..cd28bd793 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc3" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@0/tmp431@4c.conf new file mode 100644 index 000000000..a66df302f --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@0/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc5" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@1/tmp431@4c.conf new file mode 100644 index 000000000..6d3f24a5e --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@1/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc4" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf new file mode 100644 index 000000000..d8f95b047 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc6" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf new file mode 100644 index 000000000..1b075b30f --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c.conf @@ -0,0 +1,5 @@ +LABEL_temp2 = "250_soc7" +WARNHI_temp2 = "95000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "100000" +CRITLO_temp2 = "0" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 36029dd72..6cba8537d 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -45,6 +45,14 @@ CHIPS_mihawk = " \ bus@1e78a000/i2c-bus@140/ir35221@72 \ bus@1e78a000/i2c-bus@180/ir35221@70 \ bus@1e78a000/i2c-bus@180/ir35221@72 \ + bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@0/tmp431@4c \ + bus@1e78a000/i2c-bus@380/pca9545riser@70/i2c@1/tmp431@4c \ + bus@1e78a000/i2c-bus@380/pca9545@71/i2c@0/tmp431@4c \ + bus@1e78a000/i2c-bus@380/pca9545@71/i2c@1/tmp431@4c \ + bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@0/tmp431@4c \ + bus@1e78a000/i2c-bus@3c0/pca9545riser@70/i2c@1/tmp431@4c \ + bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@0/tmp431@4c \ + bus@1e78a000/i2c-bus@3c0/pca9545@71/i2c@1/tmp431@4c \ bus@1e78a000/i2c-bus@400/tmp275@48 \ bus@1e78a000/i2c-bus@400/tmp275@49 \ pwm-tacho-controller@1e786000 \ @@ -104,7 +112,7 @@ SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service" do_install_append_ibm-ac-server() { install -d ${D}/${base_libdir}/udev/rules.d/ - install ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ install -d ${D}${bindir} install -m 0755 ${WORKDIR}/start_max31785_hwmon.sh ${D}${bindir} diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json new file mode 100644 index 000000000..df51c66ab --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json @@ -0,0 +1,31 @@ +[ + { + "Desc": + { + "Name": "Ambient_Virtual_Temp", + "SensorType": "temperature" + }, + "Threshold" : + { + "CriticalHigh": 100, + "CriticalLow": 0, + "WarningHigh": 100, + "WarningLow": 0 + }, + "Params": + { + "DbusParam": + [ + { + "ParamName": "T0", + "Desc": + { + "Name": "Ambient_0_Temp", + "SensorType": "temperature" + } + } + ] + }, + "Expression": "T0" + } +] diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 000000000..53f8905be --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://virtual_sensor_config.json" + +do_install_append_rainier() { + install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ +} diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-rainier.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-rainier.override.yml new file mode 100644 index 000000000..ecc95317f --- /dev/null +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-rainier.override.yml @@ -0,0 +1,74 @@ +/xyz/openbmc_project/network/hypervisor: + - Interface: xyz.openbmc_project.Network.SystemConfiguration + Properties: + HostName: + Default: '""' + DefaultGateway: + Default: '"0.0.0.0"' + +/xyz/openbmc_project/network/hypervisor/eth0: + - Interface: xyz.openbmc_project.Network.MACAddress + Properties: + MACAddress: + Default: '"00:00:00:00:00:00"' + Validation: + Type: "regex" + Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' + - Interface: xyz.openbmc_project.Network.EthernetInterface + Properties: + DHCPEnabled: + Default: EthernetInterface::DHCPConf::none + +/xyz/openbmc_project/network/hypervisor/eth0/ipv4/addr0: + - Interface: xyz.openbmc_project.Network.IP + Properties: + Address: + Default: '"0.0.0.0"' + PrefixLength: + Default: 0 + Validation: + Type: "range" + Validator: 0..32 + Unit: "bits" + Origin: + Default: IP::AddressOrigin::Static + Type: + Default: IP::Protocol::IPv4 + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'false' + +/xyz/openbmc_project/network/hypervisor/eth1: + - Interface: xyz.openbmc_project.Network.MACAddress + Properties: + MACAddress: + Default: '"00:00:00:00:00:00"' + Validation: + Type: "regex" + Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' + - Interface: xyz.openbmc_project.Network.EthernetInterface + Properties: + DHCPEnabled: + Default: EthernetInterface::DHCPConf::none + +/xyz/openbmc_project/network/hypervisor/eth1/ipv4/addr0: + - Interface: xyz.openbmc_project.Network.IP + Properties: + Address: + Default: '"0.0.0.0"' + PrefixLength: + Default: 0 + Validation: + Type: "range" + Validator: 0..32 + Unit: "bits" + Origin: + Default: IP::AddressOrigin::Static + Type: + Default: IP::Protocol::IPv4 + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'false' + diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-tacoma.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-tacoma.override.yml new file mode 100644 index 000000000..e452cbf68 --- /dev/null +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/HypervisorInterface-default-tacoma.override.yml @@ -0,0 +1,41 @@ +/xyz/openbmc_project/network/hypervisor: + - Interface: xyz.openbmc_project.Network.SystemConfiguration + Properties: + HostName: + Default: '""' + DefaultGateway: + Default: '"0.0.0.0"' + +/xyz/openbmc_project/network/hypervisor/eth0: + - Interface: xyz.openbmc_project.Network.MACAddress + Properties: + MACAddress: + Default: '"00:00:00:00:00:00"' + Validation: + Type: "regex" + Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' + - Interface: xyz.openbmc_project.Network.EthernetInterface + Properties: + DHCPEnabled: + Default: EthernetInterface::DHCPConf::none + +/xyz/openbmc_project/network/hypervisor/eth0/ipv4/addr0: + - Interface: xyz.openbmc_project.Network.IP + Properties: + Address: + Default: '"0.0.0.0"' + PrefixLength: + Default: 0 + Validation: + Type: "range" + Validator: 0..32 + Unit: "bits" + Origin: + Default: IP::AddressOrigin::Static + Type: + Default: IP::Protocol::IPv4 + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'false' + diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 1068e1d00..3c658ae0c 100644 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml" -SRC_URI_append_ibm-ac-server += " file://ClearHostSecurityKeys-default-zero.override.yml" +SRC_URI_append_ibm-ac-server = " file://ClearHostSecurityKeys-default-zero.override.yml" SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml" SRC_URI_append = " file://ibm_settings.override.yml" +SRC_URI_append_rainier = " file://HypervisorInterface-default-rainier.override.yml" +SRC_URI_append_witherspoon-tacoma = " file://HypervisorInterface-default-tacoma.override.yml" diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend new file mode 100644 index 000000000..a982e12b1 --- /dev/null +++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -0,0 +1 @@ +EXTRA_OEMESON_witherspoon += "-Dwarm-reboot=disabled" |