From 35e295e2a161fcf146ea031de53431b2888521fa Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 19 Aug 2019 11:16:19 -0700 Subject: Sync to internal 8-19-2019 Signed-off-by: Ed Tanous --- .../configuration/entity-manager/WC-Baseboard.json | 56 +++++++--------------- 1 file changed, 18 insertions(+), 38 deletions(-) (limited to 'meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json') diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json index 9431c30a6..5dcd316c3 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json @@ -1120,8 +1120,8 @@ "Address": "0x72", "Bus": 2, "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", + "Pcie_Slot_1", + "Pcie_Slot_2", "", "FruChannel" ], @@ -1132,8 +1132,8 @@ "Address": "0x73", "Bus": 2, "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", + "Pcie_Slot_1", + "Pcie_Slot_2", "", "FruChannel" ], @@ -1156,10 +1156,10 @@ "Address": "0x74", "Bus": 2, "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", - "PcieSlot3", - "PcieSlot4" + "Pcie_Slot_1", + "Pcie_Slot_2", + "Pcie_Slot_3", + "Pcie_Slot_4" ], "Name": "PCIE Mux", "Type": "PCA9546Mux" @@ -1979,48 +1979,28 @@ "Bus": 0, "CpuID": 1, "Name": "CPU 1", - "PresenceGpio": 232, - "Thresholds": [ + "PresenceGpio": [ { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 99, - "label": "DIMM" - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 89, - "label": "DIMM" + "Name": "CPU1_PRESENCE", + "Polarity": "Low" } ], - "Type": "XeonCPU" + "Type": "XeonCPU", + "UseWA": 1 }, { "Address": "0x31", "Bus": 0, "CpuID": 2, "Name": "CPU 2", - "PresenceGpio": 242, - "Thresholds": [ + "PresenceGpio": [ { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 99, - "label": "DIMM" - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 89, - "label": "DIMM" + "Name": "CPU2_PRESENCE", + "Polarity": "Low" } ], - "Type": "XeonCPU" + "Type": "XeonCPU", + "UseWA": 1 } ], "Name": "WC Baseboard", -- cgit v1.2.3