From 0def9e22cf97088c01c2ee8fbe296d577648eb9c Mon Sep 17 00:00:00 2001 From: "B. J. Wyman" Date: Wed, 23 Jun 2021 00:19:16 +0000 Subject: Remove phosphor-gpio-presence from p10bmc The phosphor-gpio-presence application is no longer needed for power supply presence detection after the updates to using libgpiod in the phosphor-psu-monitor application. Remove the systemd parts of the bbappend, and remove the obmc conf files. Signed-off-by: B. J. Wyman Change-Id: I18a7f36e21d18a22f7625aadc3229ce5439c8d6a --- .../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 ------- meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 2 -- 5 files changed, 30 deletions(-) delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf delete mode 100644 meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/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 deleted file mode 100644 index d2c96e6430..0000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/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/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 deleted file mode 100644 index 655ce07f59..0000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/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/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 deleted file mode 100644 index 0723892d66..0000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/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/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 deleted file mode 100644 index 3dadeefbe6..0000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/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 9884173d56..995dca3aee 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -7,10 +7,8 @@ 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_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_p10bmc = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -- cgit v1.2.3