Update to internal 6-18-19

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

9 files changed, 130 insertions, 80 deletions

diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
index 978489110..88a9c5624 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
@@ -145,8 +145,8 @@ index 0000000..421699c
 +	/*C0-C7*/	"","","","","","","","",
 +	/*D0-D7*/	"","","","","","","","",
 +	/*E0-E7*/	"RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","",
-+	/*F0-F7*/	"","","","","","","","",
-+	/*G0-G7*/	"","","","","","","","",
++	/*F0-F7*/	"","","","","CPU_ERR0","CPU_ERR1","","",
++	/*G0-G7*/	"CPU_ERR2","CPU_CATERR","","","","","","",
 +	/*H0-H7*/	"","","","","","","","",
 +	/*I0-I7*/	"","","","","","","","",
 +	/*J0-J7*/	"","","","","","","","",
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
index 480d4cc18..155ba3ae4 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
@@ -52,9 +52,7 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_HID=y
 CONFIG_ASPEED_UART_ROUTING=y
-CONFIG_DEVMEM=y
 CONFIG_ASPEED_VGA_SHAREDMEM=y
-CONFIG_DEVMEM_BOOTPARAM=n
 CONFIG_PWM=y
 CONFIG_PWM_FTTMR010=y
 CONFIG_INPUT_MISC=y
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
index 271881706..2bbaa0238 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
@@ -289,8 +289,9 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 9,
-            "Name": "PVCCIN_CPU1",
+            "Name": "PVCCIN_CPU2",
             "PowerState": "On",
             "ScaleFactor": 0.7505,
             "Thresholds": [
@@ -322,8 +323,9 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 10,
-            "Name": "PVDQ_ABCD_CPU0",
+            "Name": "PVDQ_ABCD_CPU1",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -354,8 +356,9 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 11,
-            "Name": "PVDQ_EFGH_CPU0",
+            "Name": "PVDQ_EFGH_CPU1",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -386,8 +389,9 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 12,
-            "Name": "PVDQ_ABCD_CPU1",
+            "Name": "PVDQ_ABCD_CPU2",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -418,8 +422,9 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 13,
-            "Name": "PVDQ_EFGH_CPU1",
+            "Name": "PVDQ_EFGH_CPU2",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -450,8 +455,9 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 14,
-            "Name": "PVCCIO_CPU0",
+            "Name": "PVCCIO_CPU1",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -482,8 +488,9 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 15,
-            "Name": "PVCCIO_CPU1",
+            "Name": "PVCCIO_CPU2",
             "PowerState": "On",
             "Thresholds": [
                 {
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json
index 22f8b1c6d..84ff6f12f 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json
@@ -11,7 +11,7 @@
                 "Address": "0x18",
                 "Bus": "$bus",
                 "Name": "Multi Node Presence Detector",
-                "Type": "MultiNode"
+                "Type": "MultiNodePresence"
             },
             {
                 "Address": "0x48",
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json
index 7b86bfae0..a81329787 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json
@@ -1,8 +1,38 @@
 {
     "Exposes": [
         {
-            "Name": "Multi Node Supported",
-            "Type": "MultiNode"
+            "Address": "0x56",
+            "Bus": 9,
+            "Class": "MCUTemp",
+            "Name": "PDB MCU Temp",
+            "Reg": "0x22",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 115
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 110
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "MCUTempSensor"
         }
     ],
     "Name": "OPB2RH Chassis",
@@ -16,4 +46,4 @@
         "PartNumber": "R1234",
         "SerialNumber": "12345"
     }
-}
\ No newline at end of file
+}
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 75cd39719..39e101e77 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
@@ -225,6 +225,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 8,
             "Name": "PVCCIN_CPU1",
             "PowerState": "On",
@@ -258,6 +259,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 9,
             "Name": "PVCCIN_CPU2",
             "PowerState": "On",
@@ -291,6 +293,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 14,
             "Name": "PVCCIO_CPU1",
             "PowerState": "On",
@@ -323,6 +326,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 15,
             "Name": "PVCCIO_CPU2",
             "PowerState": "On",
@@ -355,6 +359,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 10,
             "Name": "PVDQ_ABCD_CPU1",
             "PowerState": "On",
@@ -387,6 +392,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 12,
             "Name": "PVDQ_ABCD_CPU2",
             "PowerState": "On",
@@ -419,6 +425,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 11,
             "Name": "PVDQ_EFGH_CPU1",
             "PowerState": "On",
@@ -451,6 +458,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 13,
             "Name": "PVDQ_EFGH_CPU2",
             "PowerState": "On",
@@ -1679,14 +1687,12 @@
             "Type": "IpmbSensor"
         },
         {
-            "BindGpioNodeID": "Node ID GPIO 0",
-            "Name": "Multi Node ID 0",
-            "Type": "MultiNode"
-        },
-        {
-            "BindGpioNodeID": "Node ID GPIO 1",
-            "Name": "Multi Node ID 1",
-            "Type": "MultiNode"
+            "GpioPins": [
+                27,
+                26
+            ],
+            "Name": "Multi Node ID",
+            "Type": "MultiNodeID"
         },
         {
             "Address": "0x71",
@@ -1701,52 +1707,6 @@
             "Type": "PCA9543Mux"
         },
         {
-            "Address": "0x30",
-            "Bus": 0,
-            "CpuID": 1,
-            "Name": "Xeon 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"
-        },
-        {
-            "Address": "0x31",
-            "Bus": 0,
-            "CpuID": 2,
-            "Name": "Xeon 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"
-        },
-        {
             "Address": "0x4E",
             "Bus": 6,
             "Name": "Exit Air Temp",
@@ -1809,16 +1769,62 @@
                 }
             ],
             "Type": "TMP75"
+        },
+        {
+            "Address": "0x30",
+            "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"
+        },
+        {
+            "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"
         }
     ],
     "Name": "TNP Baseboard",
     "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})",
-    "Type": "Board",
     "ProductId": 153,
+    "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
     }
-}
+}
\ No newline at end of file
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 982dade40..ce98132d6 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
@@ -195,6 +195,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 8,
             "Name": "PVCCIN_CPU1",
             "PowerState": "On",
@@ -228,6 +229,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 9,
             "Name": "PVCCIN_CPU2",
             "PowerState": "On",
@@ -261,6 +263,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 14,
             "Name": "PVCCIO_CPU1",
             "PowerState": "On",
@@ -293,6 +296,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 15,
             "Name": "PVCCIO_CPU2",
             "PowerState": "On",
@@ -325,6 +329,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 10,
             "Name": "PVDQ_ABC_CPU1",
             "PowerState": "On",
@@ -357,6 +362,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 12,
             "Name": "PVDQ_ABC_CPU2",
             "PowerState": "On",
@@ -389,6 +395,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 11,
             "Name": "PVDQ_DEF_CPU1",
             "PowerState": "On",
@@ -421,6 +428,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 13,
             "Name": "PVDQ_DEF_CPU2",
             "PowerState": "On",
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 bdf6b7d9c..923924a0b 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
@@ -195,6 +195,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 8,
             "Name": "PVCCIN_CPU1",
             "PowerState": "On",
@@ -228,6 +229,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 9,
             "Name": "PVCCIN_CPU2",
             "PowerState": "On",
@@ -261,6 +263,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 14,
             "Name": "PVCCIO_CPU1",
             "PowerState": "On",
@@ -293,6 +296,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 15,
             "Name": "PVCCIO_CPU2",
             "PowerState": "On",
@@ -325,6 +329,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 10,
             "Name": "PVDQ_ABC_CPU1",
             "PowerState": "On",
@@ -357,6 +362,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 12,
             "Name": "PVDQ_ABC_CPU2",
             "PowerState": "On",
@@ -389,6 +395,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 1,
             "Index": 11,
             "Name": "PVDQ_DEF_CPU1",
             "PowerState": "On",
@@ -421,6 +428,7 @@
             "Type": "ADC"
         },
         {
+            "CPURequired": 2,
             "Index": 13,
             "Name": "PVDQ_DEF_CPU2",
             "PowerState": "On",
@@ -656,13 +664,6 @@
         },
         {
             "Direction": "Input",
-            "Index": 40,
-            "Name": "NMI Input",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 49,
             "Name": "CPU CATERR",
             "Polarity": "High",
@@ -2030,4 +2031,4 @@
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
     }
-}
\ No newline at end of file
+}
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb
index c91053536..ead62f47e 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb
@@ -7,4 +7,4 @@ inherit config-in-skeleton
 LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
 
 SRCREV = "946064239016e38cd1cc346047b1d26960c06cdb"
-SKELETON_URI = "git://git@github.com/Intel-BMC/skeleton.git;protocol=ssh;branch=intel"
+SKELETON_URI = "git://git-amr-1.devtools.intel.com:29418/openbmc-skeleton.git;protocol=ssh;branch=intel"