summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
diff options
context:
space:
mode:
authorEd Tanous <ed.tanous@intel.com>2019-08-19 21:16:19 +0300
committerEd Tanous <ed@tanous.net>2019-08-20 18:56:17 +0300
commit35e295e2a161fcf146ea031de53431b2888521fa (patch)
treea0c78943fef5c085f371aaa840d46edecc1f2e95 /meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
parent9856ac69064742544fafad307d3ee4544385ffa2 (diff)
downloadopenbmc-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/configuration/entity-manager/WC-Baseboard.json')
-rw-r--r--meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json56
1 files changed, 18 insertions, 38 deletions
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",