From 37f999171cd75e117c3c4575d79dfb7033c9efb4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 4 Jun 2019 14:30:08 -0500 Subject: swift-ipmi: Add support for non-host based config The Swift MRW does a few things different here: - Renames these from gv100 to ga100 - Starts their FRU_ID at 15 - Only has 4 vs. 6 of them (From meta-ibm rev: 91a87c8b0288f235452b3073e24a5519020553e8) Change-Id: I0af55e2d0bf5e317dfae45b4e53810d3b6d8897c Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../acx22-ipmi-fru-not-sent-by-host.yaml | 54 ---------------------- .../swift/acx22-ipmi-fru-not-sent-by-host.yaml | 21 +++++++++ .../acx22-ipmi-fru-not-sent-by-host.yaml | 54 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 54 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-not-sent-by-host.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-not-sent-by-host.yaml deleted file mode 100644 index a4c34b4fc..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-fru-not-sent-by-host.yaml +++ /dev/null @@ -1,54 +0,0 @@ -20: - /system/chassis/motherboard/gv100card0: - entityID: 3 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -21: - /system/chassis/motherboard/gv100card1: - entityID: 3 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -22: - /system/chassis/motherboard/gv100card2: - entityID: 3 - entityInstance: 3 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -23: - /system/chassis/motherboard/gv100card3: - entityID: 3 - entityInstance: 4 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -24: - /system/chassis/motherboard/gv100card4: - entityID: 3 - entityInstance: 5 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board -25: - /system/chassis/motherboard/gv100card5: - entityID: 3 - entityInstance: 6 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Board Name - IPMIFruSection: Board diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml new file mode 100644 index 000000000..114360ef9 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml @@ -0,0 +1,21 @@ +15: + /system/chassis/motherboard/ga100card0: &DEFAULTS + entityInstance: 1 + entityID: 3 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +16: + /system/chassis/motherboard/ga100card1: + <<: *DEFAULTS + entityInstance: 2 +17: + /system/chassis/motherboard/ga100card2: + <<: *DEFAULTS + entityInstance: 3 +18: + /system/chassis/motherboard/ga100card3: + <<: *DEFAULTS + entityInstance: 4 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml new file mode 100644 index 000000000..a4c34b4fc --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml @@ -0,0 +1,54 @@ +20: + /system/chassis/motherboard/gv100card0: + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +21: + /system/chassis/motherboard/gv100card1: + entityID: 3 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +22: + /system/chassis/motherboard/gv100card2: + entityID: 3 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +23: + /system/chassis/motherboard/gv100card3: + entityID: 3 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +24: + /system/chassis/motherboard/gv100card4: + entityID: 3 + entityInstance: 5 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board +25: + /system/chassis/motherboard/gv100card5: + entityID: 3 + entityInstance: 6 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Board Name + IPMIFruSection: Board -- cgit v1.2.3