configurations: Split out ASRock c3.medium/m3.large chassis
Previously the romed8hm3 board config inappropriately included
components from the Open19 c3.medium.x86/m3.large.x86 chassis. Add a
config for the chassis and move the chassis components from the board
config to it.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: I3833bbf810b5e33b409110b867c09e1ca2f45ae2
diff --git a/configurations/asrock_c3_medium_x86.json b/configurations/asrock_c3_medium_x86.json
new file mode 100644
index 0000000..8d2167e
--- /dev/null
+++ b/configurations/asrock_c3_medium_x86.json
@@ -0,0 +1,362 @@
+{
+ "Exposes": [
+ {
+ "BindConnector": "FAN1",
+ "Index": 3,
+ "Name": "Fan_1a",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2500
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 23000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 24000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "FAN1",
+ "Index": 11,
+ "Name": "Fan_1b",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 20000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 21000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "FAN2",
+ "Index": 4,
+ "Name": "Fan_2a",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2500
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 23000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 24000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "FAN2",
+ "Index": 12,
+ "Name": "Fan_2b",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 20000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 21000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "FAN3",
+ "Index": 5,
+ "Name": "Fan_3a",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2500
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 23000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 24000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "FAN3",
+ "Index": 13,
+ "Name": "Fan_3b",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 20000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 21000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "FAN4",
+ "Index": 6,
+ "Name": "Fan_4a",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2500
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 23000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 24000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "FAN4",
+ "Index": 14,
+ "Name": "Fan_4b",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 2000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher non critical",
+ "Severity": 0,
+ "Value": 20000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "higher critical",
+ "Severity": 1,
+ "Value": 21000
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "Address": "0x40",
+ "Bus": 2,
+ "Labels": [
+ "iin",
+ "vin",
+ "vmon",
+ "vout1",
+ "pin",
+ "temp1"
+ ],
+ "Name": "12V_IPB_Regulator",
+ "Type": "LM25066"
+ },
+ {
+ "Address": "0x41",
+ "Bus": 2,
+ "Labels": [
+ "iin",
+ "vin",
+ "vmon",
+ "vout1",
+ "pin",
+ "temp1"
+ ],
+ "Name": "12VSB_Regulator",
+ "Type": "LM25066"
+ },
+ {
+ "Address": "0x4c",
+ "Bus": 0,
+ "Name": "Inlet",
+ "Name1": "Inlet_alt",
+ "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": "W83773G"
+ },
+ {
+ "Address": "0x4c",
+ "Bus": 2,
+ "Name": "IPB",
+ "Name1": "IPB_alt",
+ "Name2": "IPB_alt2",
+ "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": "W83773G"
+ },
+ {
+ "Address": "0x4c",
+ "Bus": 5,
+ "Name": "Backplane",
+ "Name1": "Backplane_alt",
+ "PowerState": "On",
+ "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": "W83773G"
+ }
+ ],
+ "Name": "ASRock c3.medium.x86/m3.large.x86",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '(c3.medium.x86|m3.large.x86)'})",
+ "Type": "Chassis",
+ "xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "Manufacturer": "$PRODUCT_MANUFACTURER",
+ "Model": "$PRODUCT_PRODUCT_NAME",
+ "PartNumber": "$PRODUCT_PART_NUMBER",
+ "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+ },
+ "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+ "AssetTag": "$PRODUCT_ASSET_TAG"
+ },
+ "xyz.openbmc_project.Inventory.Item.System": {}
+}
diff --git a/configurations/asrock_romed8hm3.json b/configurations/asrock_romed8hm3.json
index 965057f..e1a0929 100644
--- a/configurations/asrock_romed8hm3.json
+++ b/configurations/asrock_romed8hm3.json
@@ -501,32 +501,44 @@
"Type": "BMC"
},
{
- "Address": "0x40",
- "Bus": 2,
- "Labels": [
- "iin",
- "vin",
- "vmon",
- "vout1",
- "pin",
- "temp1"
+ "Name": "FAN1",
+ "Pwm": 3,
+ "Status": "disabled",
+ "Tachs": [
+ 4,
+ 12
],
- "Name": "12V_IPB_Regulator",
- "Type": "LM25066"
+ "Type": "IntelFanConnector"
},
{
- "Address": "0x41",
- "Bus": 2,
- "Labels": [
- "iin",
- "vin",
- "vmon",
- "vout1",
- "pin",
- "temp1"
+ "Name": "FAN2",
+ "Pwm": 4,
+ "Status": "disabled",
+ "Tachs": [
+ 5,
+ 13
],
- "Name": "12VSB_Regulator",
- "Type": "LM25066"
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "FAN3",
+ "Pwm": 5,
+ "Status": "disabled",
+ "Tachs": [
+ 6,
+ 14
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Name": "FAN4",
+ "Pwm": 6,
+ "Status": "disabled",
+ "Tachs": [
+ 7,
+ 15
+ ],
+ "Type": "IntelFanConnector"
},
{
"Address": "0x2d",
@@ -574,107 +586,6 @@
}
],
"Type": "NCT6779"
- },
- {
- "Address": "0x4c",
- "Bus": 0,
- "Name": "Inlet",
- "Name1": "Inlet_alt",
- "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": "W83773G"
- },
- {
- "Address": "0x4c",
- "Bus": 2,
- "Name": "IPB",
- "Name1": "IPB_alt",
- "Name2": "IPB_alt2",
- "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": "W83773G"
- },
- {
- "Address": "0x4c",
- "Bus": 5,
- "Name": "Backplane",
- "Name1": "Backplane_alt",
- "PowerState": "On",
- "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": "W83773G"
}
],
"Name": "ASRock ROMED8HM3",
diff --git a/meson.build b/meson.build
index ab8c4b6..afc59a6 100644
--- a/meson.build
+++ b/meson.build
@@ -78,6 +78,7 @@
'a2ux8x4riser.json',
'acbell_rica_psu.json',
'acbel_r1ca2122a_psu.json',
+ 'asrock_c3_medium_x86.json',
'asrock_e3c246d4i.json',
'asrock_e3c256d4i.json',
'asrock_m3_small_x86.json',