commit e2c3bce10f2714535153097b9d353bfc1bc39bc2
author Alexander Hansen <alexander.hansen@9elements.com> Thu Apr 03 17:17:03 2025 +0200
committer Alexander Hansen <alexander.hansen@9elements.com> Mon Apr 07 15:34:33 2025 +0200
tree 1324ad9a8fe4c03f6ec5603e2ad90815ee1e886d
parent 5014a2111b8454defb1ba7d19267dd1f52f2aed1

schemas: legacy: extract EEPROM

This allows to remove some properties from 'Aggregate' schema which are
no longer needed, since there is now a more specific schema to use.

There was one configuration without 'Address' property,
which was likely a misconfiguration.

The file is sas_module.json which has "Probe": "FALSE" set, so it will
never be probed anyways. The misconfiguration has been removed.

Tested: Schema Validator Pass

Change-Id: I5ceda72a09a4b1dbcce64de9d087701b25a15dac
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>

configurations/sas_module.json

diff --git a/configurations/sas_module.json b/configurations/sas_module.json
index 30e4b21..f6588e5 100644
--- a/configurations/sas_module.json
+++ b/configurations/sas_module.json
@@ -1,11 +1,6 @@
 {
     "Exposes": [
         {
-            "Bus": "$bus",
-            "Name": "SAS Module FRU",
-            "Type": "EEPROM"
-        },
-        {
             "Address": "0x4C",
             "Bus": "$bus",
             "Name": "SAS Module Temperature",

schemas/global.json

diff --git a/schemas/global.json b/schemas/global.json
index a61d11d..b1709f9 100644
--- a/schemas/global.json
+++ b/schemas/global.json
@@ -115,6 +115,9 @@
                             "$ref": "legacy.json#/$defs/NVME1000"
                         },
                         {
+                            "$ref": "legacy.json#/$defs/EEPROM"
+                        },
+                        {
                             "$ref": "virtual_sensor.json#/$defs/VirtualSensor"
                         },
                         {

schemas/legacy.json

diff --git a/schemas/legacy.json b/schemas/legacy.json
index cf40dbd..51ad1cf 100644
--- a/schemas/legacy.json
+++ b/schemas/legacy.json
@@ -759,6 +759,25 @@
             "required": ["Name", "Type", "Bus", "Address"],
             "type": "object"
         },
+        "EEPROM": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "$ref": "#/$defs/Types/Name"
+                },
+                "Bus": {
+                    "$ref": "#/$defs/Types/Bus"
+                },
+                "Address": {
+                    "$ref": "#/$defs/Types/Address"
+                },
+                "Type": {
+                    "const": "EEPROM"
+                }
+            },
+            "required": ["Name", "Type", "Bus", "Address"],
+            "type": "object"
+        },
         "Aggregate": {
             "description": "Don't add additional properties to this schema. Consult README.schema for instructions on adding new Exposes element sub-schema.",
             "additionalProperties": false,
@@ -1200,7 +1219,6 @@
                 "enum": [
                     "SBRMI",
                     "smpro_hwmon",
-                    "EEPROM",
                     "BMC",
                     "Board",
                     "pmbus",