1 files changed, 16 insertions, 166 deletions
diff --git a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json
index 1a30fbbbe9..74fb64eaba 100644
--- a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json
+++ b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json
@@ -505,148 +505,24 @@
             "Type": "HostCpuUtilization"
         },
         {
-            "LED": "fan1_fault",
-            "Name": "1U System Fan connector 1",
-            "Pwm": 0,
-            "Status": "disabled",
+            "C1": 92.16,
+            "C2": 107.52,
+            "MaxCFM": 17.5,
+            "Name": "System Airflow",
+            "TachMaxPercent": 100,
+            "TachMinPercent": 20,
             "Tachs": [
-                0,
-                1
+                "Fan CPU1b",
+                "Fan 0",
+                "Fan chassis 1",
+                "Fan chassis 2",
+                "Fan chassis 3",
+                "Fan chassis 4",
+                "Fan CPU1a",
+                "Fan CPU2a",
+                "Fan CPU2b"
             ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan2_fault",
-            "Name": "1U System Fan connector 2",
-            "Pwm": 1,
-            "Status": "disabled",
-            "Tachs": [
-                2,
-                3
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan3_fault",
-            "Name": "1U System Fan connector 3",
-            "Pwm": 2,
-            "Status": "disabled",
-            "Tachs": [
-                4,
-                5
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan4_fault",
-            "Name": "1U System Fan connector 4",
-            "Pwm": 3,
-            "Status": "disabled",
-            "Tachs": [
-                6,
-                7
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan5_fault",
-            "Name": "1U System Fan connector 5",
-            "Pwm": 4,
-            "Status": "disabled",
-            "Tachs": [
-                8,
-                9
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan6_fault",
-            "Name": "1U System Fan connector 6",
-            "Pwm": 5,
-            "Status": "disabled",
-            "Tachs": [
-                10,
-                11
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan1_fault",
-            "Name": "2U System Fan connector 1",
-            "Pwm": 0,
-            "Status": "disabled",
-            "Tachs": [
-                0
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan2_fault",
-            "Name": "2U System Fan connector 2",
-            "Pwm": 1,
-            "Status": "disabled",
-            "Tachs": [
-                2
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan3_fault",
-            "Name": "2U System Fan connector 3",
-            "Pwm": 2,
-            "Status": "disabled",
-            "Tachs": [
-                4
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan4_fault",
-            "Name": "2U System Fan connector 4",
-            "Pwm": 3,
-            "Status": "disabled",
-            "Tachs": [
-                6
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan5_fault",
-            "Name": "2U System Fan connector 5",
-            "Pwm": 4,
-            "Status": "disabled",
-            "Tachs": [
-                8
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "LED": "fan6_fault",
-            "Name": "2U System Fan connector 6",
-            "Pwm": 5,
-            "Status": "disabled",
-            "Tachs": [
-                10
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "CPU 1 Fan Connector",
-            "Pwm": 7,
-            "Status": "disabled",
-            "Tachs": [
-                13
-            ],
-            "Type": "IntelFanConnector"
-        },
-        {
-            "Name": "CPU 2 Fan Connector",
-            "Pwm": 8,
-            "Status": "disabled",
-            "Tachs": [
-                14
-            ],
-            "Type": "IntelFanConnector"
+            "Type": "CFMSensor"
         },
         {
             "Name": "Node Manager Sensor",
@@ -1143,32 +1019,6 @@
                 }
             ],
             "Type": "TMP75"
-        },
-        {
-            "Address": "0x30",
-            "Bus": 0,
-            "CpuID": 1,
-            "Name": "CPU 1",
-            "PresenceGpio": [
-                {
-                    "Name": "CPU1_PRESENCE",
-                    "Polarity": "Low"
-                }
-            ],
-            "Type": "XeonCPU"
-        },
-        {
-            "Address": "0x31",
-            "Bus": 0,
-            "CpuID": 2,
-            "Name": "CPU 2",
-            "PresenceGpio": [
-                {
-                    "Name": "CPU2_PRESENCE",
-                    "Polarity": "Low"
-                }
-            ],
-            "Type": "XeonCPU"
         }
     ],
     "Name": "SILA Baseboard",