From b6ce29673b87cefbe4ed4aa719cad389b68e9190 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 16:42:17 +0000 Subject: ibm: gpio-monitor: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Tested: Built rainier and verified the files were installed as expected: rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/gpio/phosphor-power-supply-0.conf Change-Id: I6539c71cfc37fa67027204b17c68a0c7f8fec5a6 Signed-off-by: Adriana Kobylak --- .../p10bmc/obmc/gpio/phosphor-power-supply-0.conf | 7 +++++++ .../p10bmc/obmc/gpio/phosphor-power-supply-1.conf | 7 +++++++ .../p10bmc/obmc/gpio/phosphor-power-supply-2.conf | 7 +++++++ .../p10bmc/obmc/gpio/phosphor-power-supply-3.conf | 7 +++++++ .../rainier/obmc/gpio/phosphor-power-supply-0.conf | 7 ------- .../rainier/obmc/gpio/phosphor-power-supply-1.conf | 7 ------- .../rainier/obmc/gpio/phosphor-power-supply-2.conf | 7 ------- .../rainier/obmc/gpio/phosphor-power-supply-3.conf | 7 ------- meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf create mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf create mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf create mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-3.conf delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf new file mode 100644 index 000000000..d2c96e643 --- /dev/null +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf @@ -0,0 +1,7 @@ +INVENTORY=/system/chassis/motherboard/powersupply0 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=144 +DRIVER_BIND_DELAY_MS=1500 +NAME=powersupply0 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 000000000..655ce07f5 --- /dev/null +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf @@ -0,0 +1,7 @@ +INVENTORY=/system/chassis/motherboard/powersupply1 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=145 +DRIVER_BIND_DELAY_MS=1500 +NAME=powersupply1 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf new file mode 100644 index 000000000..0723892d6 --- /dev/null +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf @@ -0,0 +1,7 @@ +INVENTORY=/system/chassis/motherboard/powersupply2 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=146 +DRIVER_BIND_DELAY_MS=1500 +NAME=powersupply2 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006a +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-3.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-3.conf new file mode 100644 index 000000000..3dadeefbe --- /dev/null +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-3.conf @@ -0,0 +1,7 @@ +INVENTORY=/system/chassis/motherboard/powersupply3 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=147 +DRIVER_BIND_DELAY_MS=1500 +NAME=powersupply3 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006b +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf deleted file mode 100644 index d2c96e643..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply0 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=144 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply0 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf deleted file mode 100644 index 655ce07f5..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply1 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=145 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply1 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf deleted file mode 100644 index 0723892d6..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply2 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=146 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply2 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006a -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf deleted file mode 100644 index 3dadeefbe..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply3 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=147 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply3 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006b -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index e5af8850c..9884173d5 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -7,10 +7,10 @@ FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POW SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" SYSTEMD_LINK_${PN}-presence_append_mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_LINK_${PN}-presence_append_rainier = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK_${PN}-presence_append_p10bmc = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_rainier = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_p10bmc = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -- cgit v1.2.3