configuration: mtjade: update CPU index and inventory information
Update CPURequired property to use index starting from 0 to match what
smbios-mdr created.
This commit also updates inventory information mapping from FRU EEPROM.
Change-Id: I781d3b0e325391633e8aa0dfbba27fa6a4a73ab1
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
diff --git a/configurations/mtjade.json b/configurations/mtjade.json
index 7a24e34..2508823 100644
--- a/configurations/mtjade.json
+++ b/configurations/mtjade.json
@@ -26,7 +26,8 @@
"BridgeGpio": [
{
"Name": "rtc-battery-voltage-read-enable",
- "Polarity": "High"
+ "Polarity": "High",
+ "SetupTime": 0.02
}
],
"Index": 29,
@@ -50,7 +51,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 0,
"Name": "S0_0V8_VDDC_SOC",
"PollRate": 1,
@@ -73,7 +74,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 1,
"Name": "S1_0V8_VDDC_SOC",
"PollRate": 1,
@@ -96,7 +97,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 2,
"Name": "S0_0V75_PCP",
"PollRate": 1,
@@ -119,7 +120,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 3,
"Name": "S1_0V75_PCP",
"PollRate": 1,
@@ -142,7 +143,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 4,
"Name": "S0_1V2_VDDQ0123",
"PollRate": 1,
@@ -165,7 +166,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 5,
"Name": "S1_1V2_VDDQ0123",
"PollRate": 1,
@@ -188,7 +189,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 6,
"Name": "S0_0V6_VTT0123",
"PollRate": 1,
@@ -211,7 +212,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 7,
"Name": "S1_0V6_VTT0123",
"PollRate": 1,
@@ -234,7 +235,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 8,
"Name": "S0_2V5_VPP0123",
"PollRate": 1,
@@ -257,7 +258,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 9,
"Name": "S1_2V5_VPP0123",
"PollRate": 1,
@@ -280,7 +281,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 10,
"Name": "S0_1V2_VDDQ4567",
"PollRate": 1,
@@ -303,7 +304,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 11,
"Name": "S1_1V2_VDDQ4567",
"PollRate": 1,
@@ -326,7 +327,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 12,
"Name": "S0_0V6_VTT4567",
"PollRate": 1,
@@ -349,7 +350,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 13,
"Name": "S1_0V6_VTT4567",
"PollRate": 1,
@@ -372,7 +373,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 14,
"Name": "S0_2V5_VPP4567",
"PollRate": 1,
@@ -395,7 +396,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 15,
"Name": "S1_2V5_VPP4567",
"PollRate": 1,
@@ -418,7 +419,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 16,
"Name": "S0_0V85_RCA",
"PollRate": 1,
@@ -441,7 +442,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 17,
"Name": "S1_0V85_RCA",
"PollRate": 1,
@@ -464,7 +465,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 18,
"Name": "S0_1V8_VDDH",
"PollRate": 1,
@@ -487,7 +488,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 19,
"Name": "S1_1V8_VDDH",
"PollRate": 1,
@@ -510,7 +511,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 20,
"Name": "S0_1V5_VDDH",
"PollRate": 1,
@@ -533,7 +534,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 21,
"Name": "S1_1V5_VDDH",
"PollRate": 1,
@@ -556,7 +557,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 22,
"Name": "S0_1V8_SOC",
"PollRate": 1,
@@ -579,7 +580,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 23,
"Name": "S1_1V8_SOC",
"PollRate": 1,
@@ -602,7 +603,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 24,
"Name": "S0_1V8_PCP",
"PollRate": 1,
@@ -625,7 +626,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 25,
"Name": "S1_1V8_PCP",
"PollRate": 1,
@@ -648,7 +649,7 @@
"Type": "ADC"
},
{
- "CPURequired": 1,
+ "CPURequired": 0,
"Index": 26,
"Name": "S0_3V3_SOC",
"PollRate": 1,
@@ -671,7 +672,7 @@
"Type": "ADC"
},
{
- "CPURequired": 2,
+ "CPURequired": 1,
"Index": 27,
"Name": "S1_3V3_SOC",
"PollRate": 1,
@@ -1052,6 +1053,10 @@
"Type": "EEPROM"
},
{
+ "Name": "MB Upstream Port",
+ "Type": "MB Upstream Port"
+ },
+ {
"Name": "nvme_bp_max",
"Sensors": [
"nvme0",
@@ -1408,16 +1413,17 @@
}
],
"Name": "Mt.Jade",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*Mt.Jade'})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Mt.Jade Server System'})",
"Type": "Chassis",
"xyz.openbmc_project.Common.UUID": {
"UUID": "$MULTIRECORD_UUID"
},
"xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "BuildDate": "$BOARD_MANUFACTURE_DATE",
"Manufacturer": "$PRODUCT_MANUFACTURER",
"Model": "$PRODUCT_PRODUCT_NAME $PRODUCT_VERSION",
- "PartNumber": "$CHASSIS_PART_NUMBER",
- "SerialNumber": "$CHASSIS_SERIAL_NUMBER"
+ "PartNumber": "$PRODUCT_PART_NUMBER",
+ "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
},
"xyz.openbmc_project.Inventory.Decorator.AssetTag": {
"AssetTag": "$PRODUCT_ASSET_TAG"
@@ -1427,6 +1433,9 @@
"com.ampere.Hardware.Chassis.Model.MtJade"
]
},
+ "xyz.openbmc_project.Inventory.Decorator.Revision": {
+ "Version": "$PRODUCT_VERSION"
+ },
"xyz.openbmc_project.Inventory.Item.NetworkInterface": {
"MACAddress": "$BOARD_INFO_AM1"
},