commit 3e55ec449885062c5c64dacba38a1a7e72683398
author Andrew Geissler <geissonator@yahoo.com> Thu Mar 11 14:04:27 2021 -0600
committer Ed Tanous <ed@tanous.net> Thu Mar 25 16:55:20 2021 +0000
tree cb0b1ce16e88138a3bcfb89a16eecff179889ae7
parent 1694ef625a1075599e40faa695a40d61ccd91095

configs: add ibm rainier 1s4u

The rainier 1s4u system will be different enough from the standard 4u
variant that a new config is required. These differences include a
different kernel device tree, different power supplies, and a
different fan configuration.

Tested:
- Verified that when IM keyword was programmed to match the 1s4u that
  correct config was loaded by entity manager
  /xyz/openbmc_project/inventory/system/chassis
     `-/xyz/openbmc_project/inventory/system/chassis/Rainier_1S4U_Chassis
     `-/xyz/openbmc_project/inventory/system/chassis/Rainier_1S4U_Chassis/Compatible_System

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ieca50c03154d268726ed9ec541939e73658d427d

configurations/Rainier 1S4U Chassis.json

diff --git a/configurations/Rainier 1S4U Chassis.json b/configurations/Rainier 1S4U Chassis.json
new file mode 100644
index 0000000..b381585
--- /dev/null
+++ b/configurations/Rainier 1S4U Chassis.json
@@ -0,0 +1,17 @@
+{
+    "Exposes": [
+        {
+            "Name": "Compatible System",
+            "Type": "IBMCompatibleSystem",
+            "Names": [
+                "ibm,rainier-1s4u",
+                "ibm,rainier"
+            ]
+        }
+    ],
+    "Name": "Rainier 1S4U Chassis",
+    "Probe": [
+        "com.ibm.ipzvpd.VSBP({'IM': [80, 0, 16, 2]})"
+    ],
+    "Type": "Chassis"
+}

configurations/Rainier 4U Chassis.json

diff --git a/configurations/Rainier 4U Chassis.json b/configurations/Rainier 4U Chassis.json
index cd22108..814aa9a 100644
--- a/configurations/Rainier 4U Chassis.json
+++ b/configurations/Rainier 4U Chassis.json
@@ -11,9 +11,7 @@
     ],
     "Name": "Rainier 4U Chassis",
     "Probe": [
-        "com.ibm.ipzvpd.VSBP({'IM': [80, 0, 16, 0]})",
-        "OR",
-        "com.ibm.ipzvpd.VSBP({'IM': [80, 0, 16, 2]})"
+        "com.ibm.ipzvpd.VSBP({'IM': [80, 0, 16, 0]})"
     ],
     "Type": "Chassis"
 }

meson.build

diff --git a/meson.build b/meson.build
index 8e15733..ffe3d09 100644
--- a/meson.build
+++ b/meson.build
@@ -110,6 +110,7 @@
     'PSSF222201A.json',
     'Rainier 2U Chassis.json',
     'Rainier 4U Chassis.json',
+    'Rainier 1S4U Chassis.json',
     'R1000 Chassis.json',
     'R2000 Chassis.json',
     'SAS Module.json',

schemas/IBM.json

diff --git a/schemas/IBM.json b/schemas/IBM.json
index b4fa9b0..84f9cd4 100644
--- a/schemas/IBM.json
+++ b/schemas/IBM.json
@@ -85,6 +85,7 @@
                         "enum": [
                             "ibm,everest",
                             "ibm,rainier-2u",
+                            "ibm,rainier-1s4u",
                             "ibm,rainier-4u",
                             "ibm,rainier"
                         ]