diff options
author | Adriana Kobylak <anoo@us.ibm.com> | 2021-03-25 20:20:24 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-04-01 15:11:44 +0300 |
commit | 63ed80d2521ee2c5f5b3b0091c3f4d379eebd067 (patch) | |
tree | 8e728a76ce3f88475cdcc4fd712761e50de75776 /meta-ibm/recipes-phosphor | |
parent | 8452cdb4984f068e050b6e12072ca346eb9c6211 (diff) | |
download | openbmc-63ed80d2521ee2c5f5b3b0091c3f4d379eebd067.tar.xz |
ibm: sensors: Replace rainier with p10bmc
The IBM rainier machine name is being replaced with the generic p10bmc.
Change-Id: I43d08c3be45d8cc8b03914b9bc257df2668e9fe0
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor')
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend | 2 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf (renamed from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf (renamed from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json (renamed from meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend | 2 |
6 files changed, 4 insertions, 4 deletions
diff --git a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 3f2661301..6c283f455 100644 --- a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_rainier = "hwmontempsensor" +PACKAGECONFIG_p10bmc = "hwmontempsensor" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf index c3b9db146..c3b9db146 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf index d3df21599..d3df21599 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 8e4d5f621..8841019e5 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -74,7 +74,7 @@ CHIPS_witherspoon-tacoma = " \ bus@1e78a000/i2c-bus@500/tmp275@4a \ " -CHIPS_rainier = " \ +CHIPS_p10bmc = " \ bus@1e78a000/i2c-bus@400/max31785@52 \ bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52 \ " @@ -110,7 +110,7 @@ SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_rainier = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Enable and install the max31785-msl package PACKAGECONFIG_append_ibm-ac-server = " max31785-msl" 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/p10bmc/virtual_sensor_config.json index df51c66ab..df51c66ab 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 53f8905be..878a58a01 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://virtual_sensor_config.json" -do_install_append_rainier() { +do_install_append_p10bmc() { install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ } |