diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-08-19 21:16:19 +0300 |
---|---|---|
committer | Ed Tanous <ed@tanous.net> | 2019-08-20 18:56:17 +0300 |
commit | 35e295e2a161fcf146ea031de53431b2888521fa (patch) | |
tree | a0c78943fef5c085f371aaa840d46edecc1f2e95 /meta-openbmc-mods/meta-ast2500/recipes-phosphor | |
parent | 9856ac69064742544fafad307d3ee4544385ffa2 (diff) | |
download | openbmc-35e295e2a161fcf146ea031de53431b2888521fa.tar.xz |
Sync to internal 8-19-2019
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500/recipes-phosphor')
3 files changed, 41 insertions, 111 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json index 235e7965a..0e1848dd2 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json @@ -1793,46 +1793,16 @@ "Bus": 0, "CpuID": 1, "Name": "CPU 1", - "Thresholds": [ - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper critical", - "Severity": 1, - "Value": 99 - }, - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper non critical", - "Severity": 0, - "Value": 89 - } - ], - "Type": "XeonCPU" + "Type": "XeonCPU", + "UseWA": 1 }, { "Address": "0x31", "Bus": 0, "CpuID": 2, "Name": "CPU 2", - "Thresholds": [ - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper critical", - "Severity": 1, - "Value": 99 - }, - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper non critical", - "Severity": 0, - "Value": 89 - } - ], - "Type": "XeonCPU" + "Type": "XeonCPU", + "UseWA": 1 } ], "Name": "TNP Baseboard", 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", diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json index 7da6fe261..71a5540da 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json @@ -1113,8 +1113,8 @@ "Address": "0x72", "Bus": 2, "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", + "Pcie_Slot_1", + "Pcie_Slot_2", "", "FruChannel" ], @@ -1125,8 +1125,8 @@ "Address": "0x73", "Bus": 2, "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", + "Pcie_Slot_1", + "Pcie_Slot_2", "", "FruChannel" ], @@ -1149,10 +1149,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" @@ -1972,48 +1972,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": "WP Baseboard", @@ -2034,4 +2014,4 @@ "AssetTag": "$PRODUCT_ASSET_TAG" }, "xyz.openbmc_project.Inventory.Item.System": {} -}
\ No newline at end of file +} |