summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam de Abreu Pinho <williamdapinho@gmail.com>2025-08-14 21:53:07 +0300
committerJagpal S Gill <paligill@gmail.com>2025-08-28 00:30:20 +0300
commita49bffa0202f5a1b13c867527c8c2949b6bdcd2d (patch)
tree3baffffea6a3eeef883db8645dd8d910bb0f66bd
parent366bb26d37b1963673784d48d667f26e485f3f0a (diff)
downloadopenbmc-a49bffa0202f5a1b13c867527c8c2949b6bdcd2d.tar.xz
facebook-minerva: remove fan configuration from phosphor-gpio-presence
Remove fan configuration from minerva-phosphor-multi-gpio-presence.json. Since the file is now empty, this patch deletes it and removes its references from the .bbapend file. Tested: Related PR: https://gerrit.openbmc.org/c/openbmc/entity-manager/+/82819 Change-Id: I99e947c7df085426dd04e301e93bffc1de9607d4 Signed-off-by: William de Abreu Pinho <williamdapinho@gmail.com>
-rw-r--r--meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json146
-rw-r--r--meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend3
2 files changed, 0 insertions, 149 deletions
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json
deleted file mode 100644
index 5c6d3c33ef..0000000000
--- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json
+++ /dev/null
@@ -1,146 +0,0 @@
-[
- {
- "Name": "FAN1",
- "LineName": "FAN1_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN1"
- },
- {
- "Name": "FAN2",
- "LineName": "FAN2_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN2"
- },
- {
- "Name": "FAN3",
- "LineName": "FAN3_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN3"
- },
- {
- "Name": "FAN4",
- "LineName": "FAN4_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN4"
- },
- {
- "Name": "FAN5",
- "LineName": "FAN5_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN5"
- },
- {
- "Name": "FAN6",
- "LineName": "FAN6_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN6"
- },
- {
- "Name": "FAN7",
- "LineName": "FAN7_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN7"
- },
- {
- "Name": "FAN8",
- "LineName": "FAN8_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN8"
- },
- {
- "Name": "FAN9",
- "LineName": "FAN9_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN9"
- },
- {
- "Name": "FAN10",
- "LineName": "FAN10_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN10"
- },
- {
- "Name": "FAN11",
- "LineName": "FAN11_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN11"
- },
- {
- "Name": "FAN12",
- "LineName": "FAN12_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN12"
- },
- {
- "Name": "FAN13",
- "LineName": "FAN13_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN13"
- },
- {
- "Name": "FAN14",
- "LineName": "FAN14_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN14"
- },
- {
- "Name": "FAN15",
- "LineName": "FAN15_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN15"
- },
- {
- "Name": "FAN16",
- "LineName": "FAN16_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN16"
- },
- {
- "Name": "FAN17",
- "LineName": "FAN17_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN17"
- },
- {
- "Name": "FAN18",
- "LineName": "FAN18_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN18"
- },
- {
- "Name": "FAN19",
- "LineName": "FAN19_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN19"
- },
- {
- "Name": "FAN20",
- "LineName": "FAN20_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN20"
- },
- {
- "Name": "FAN21",
- "LineName": "FAN21_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN21"
- },
- {
- "Name": "FAN22",
- "LineName": "FAN22_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN22"
- },
- {
- "Name": "FAN23",
- "LineName": "FAN23_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN23"
- },
- {
- "Name": "FAN24",
- "LineName": "FAN24_PRSNT",
- "Bias": "DISABLE",
- "Inventory": "/system/board/Minerva_Fan_Board/FAN24"
- }
-]
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 855c004b2c..d3217bf262 100644
--- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -17,7 +17,6 @@ SERVICE_LIST = "rpu-ready-assert@.service \
SERVICE_FILE_FMT = "file://{0}"
SRC_URI += "file://minerva-phosphor-multi-gpio-monitor.json \
- file://minerva-phosphor-multi-gpio-presence.json \
file://logging \
file://fan-reload \
file://cr-toggle-boot-logger \
@@ -36,8 +35,6 @@ do_install:append() {
install -d ${D}${datadir}/phosphor-gpio-monitor
install -m 0644 ${UNPACKDIR}/minerva-phosphor-multi-gpio-monitor.json \
${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
- install -m 0644 ${UNPACKDIR}/minerva-phosphor-multi-gpio-presence.json \
- ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json
for s in ${SERVICE_LIST}
do