From 88edf3c838d5eebfae0f820b8437435026d2ca12 Mon Sep 17 00:00:00 2001 From: Konstantin Aladyshev Date: Wed, 21 Apr 2021 18:50:09 +0300 Subject: meta-ethanolx: Remove 'phosphor-hwmon' app and its configuration files As now 'entity-manager' and 'dbus-sensors' apps are used for the sensor monitoring, 'phosphor-hwmon' app and its configuration files are no longer needed. Moreover if 'phosphor-hwmon' app is present alongside with the 'dbus-sensors' app, it would produce duplicate sensors on Redfish. Signed-off-by: Konstantin Aladyshev Change-Id: I251663a05a8447ad84e13855c02284930ba8d8f4 --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 + .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf | 8 -------- .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf | 8 -------- .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf | 8 -------- .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf | 8 -------- .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf | 8 -------- .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf | 8 -------- .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf | 8 -------- .../ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf | 8 -------- .../ahb/apb/pwm-tacho-controller@1e786000.conf | 23 ---------------------- .../sensors/phosphor-hwmon_%.bbappend | 20 ------------------- 11 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf delete mode 100644 meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend (limited to 'meta-amd') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 7469c9a1c7..7fb6e7ec18 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -24,6 +24,7 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf deleted file mode 100644 index 9cd98bb25c..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "BMC" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf deleted file mode 100644 index 8e4a2afb65..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_ABCD_P1_EFGH" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf deleted file mode 100644 index 5c5c230bee..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P1_EFGH" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf deleted file mode 100644 index 3570aafdf9..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "PCIe_Slots" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf deleted file mode 100644 index 68143291a8..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_EFGH_P1_ABCD" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf deleted file mode 100644 index 51a5e29d4d..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P1_ABCD" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf deleted file mode 100644 index 0c28e5d250..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_EFGH" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf deleted file mode 100644 index 9a0eb75650..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_ABCD" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index 0620d16401..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,23 +0,0 @@ -# EthanolX has 8 fan ports but only 2 are standard 4-wire fans with PWM and TACH. -LABEL_fan1 = "P0_Fan_Speed" -LABEL_fan2 = "P1_Fan_Speed" - -PWM_TARGET_fan1 = "1" -PWM_TARGET_fan2 = "2" - -WARNLO_fan1= "10" -WARNHI_fan1= "8000" -CRITHI_fan1 = "10000" -CRITLO_fan1 = "0" -MINVALUE_fan1 = "100" -MAXVALUE_fan1 = "6000" -EVENT_fan1= "WARNHI,WARNLO,CRITHI,CRITLO" - -WARNLO_fan2= "10" -WARNHI_fan2= "8000" -CRITHI_fan2 = "10000" -CRITLO_fan2 = "0" -MINVALUE_fan2 = "100" -MAXVALUE_fan2 = "6000" -EVENT_fan2= "WARNHI,WARNLO,CRITHI,CRITLO" - diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend deleted file mode 100644 index b0631e627b..0000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -FILESEXTRAPATHS_prepend_ethanolx := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_ethanolx = " -Dnegative-errno-on-fail=true" - - -CHIPS = " \ - bus@1e78a000/i2c-bus@300/lm75a@48 \ - bus@1e78a000/i2c-bus@300/lm75a@49 \ - bus@1e78a000/i2c-bus@300/lm75a@4a \ - bus@1e78a000/i2c-bus@300/lm75a@4b \ - bus@1e78a000/i2c-bus@300/lm75a@4c \ - bus@1e78a000/i2c-bus@300/lm75a@4d \ - bus@1e78a000/i2c-bus@300/lm75a@4e \ - bus@1e78a000/i2c-bus@300/lm75a@4f \ - pwm-tacho-controller@1e786000 \ - " -ITEMSFMT = "ahb/apb/{0}.conf" -ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" - -ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ethanolx = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -- cgit v1.2.3