From 35e295e2a161fcf146ea031de53431b2888521fa Mon Sep 17 00:00:00 2001
From: Ed Tanous <ed.tanous@intel.com>
Date: Mon, 19 Aug 2019 11:16:19 -0700
Subject: Sync to internal 8-19-2019

Signed-off-by: Ed Tanous <ed.tanous@intel.com>
---
 .../configuration/entity-manager/WP-Baseboard.json | 58 +++++++---------------
 1 file changed, 19 insertions(+), 39 deletions(-)

(limited to 'meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json')

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
+}
-- 
cgit v1.2.3