Apply autojson to all existing configurations
A majority of these changes come in two categories. First, the newline
at the end of the file was inconsistent. As of HEAD~1, autojson will
now make it consistent. Secondly, there are new files that the authors
forgot to format appropriately.
Tested:
Ran autojson, and observed it no longer failed
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ia210ff1852ce902ef3ac7477d01b01c55b70c435
diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16 Riser.json
index c2b3579..6ccc92d 100644
--- a/configurations/1Ux16 Riser.json
+++ b/configurations/1Ux16 Riser.json
@@ -152,4 +152,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index 38b7937..74d189d 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -152,4 +152,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/8X25 HSBP.json b/configurations/8X25 HSBP.json
index 8c1043a..6e57106 100644
--- a/configurations/8X25 HSBP.json
+++ b/configurations/8X25 HSBP.json
@@ -17,4 +17,4 @@
"Name": "1U_HSBP",
"Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'F1U8X25S3PHSBP'})",
"Type": "Board"
-}
\ No newline at end of file
+}
diff --git a/configurations/A2UL16RISER.json b/configurations/A2UL16RISER.json
index 4a454b9..8d77300 100644
--- a/configurations/A2UL16RISER.json
+++ b/configurations/A2UL16RISER.json
@@ -152,4 +152,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/A2UX8X4RISER.json b/configurations/A2UX8X4RISER.json
index 20557bf..a65d2ae 100644
--- a/configurations/A2UX8X4RISER.json
+++ b/configurations/A2UX8X4RISER.json
@@ -50,4 +50,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/AHW1UM2RISER.json b/configurations/AHW1UM2RISER.json
index d26ac2c..cdb76c5 100644
--- a/configurations/AHW1UM2RISER.json
+++ b/configurations/AHW1UM2RISER.json
@@ -152,4 +152,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/AXX1P100HSSI_AIC.json b/configurations/AXX1P100HSSI_AIC.json
index f47610c..9afc0b7 100644
--- a/configurations/AXX1P100HSSI_AIC.json
+++ b/configurations/AXX1P100HSSI_AIC.json
@@ -30,4 +30,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/AXX2PRTHDHD.json b/configurations/AXX2PRTHDHD.json
index 25e09c5..7a3f130 100644
--- a/configurations/AXX2PRTHDHD.json
+++ b/configurations/AXX2PRTHDHD.json
@@ -88,4 +88,4 @@
"PartNumber": "$BOARD_PART_NUMBER",
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
-}
\ No newline at end of file
+}
diff --git a/configurations/BNP Baseboard.json b/configurations/BNP Baseboard.json
index 939c4f9..b9b2900 100644
--- a/configurations/BNP Baseboard.json
+++ b/configurations/BNP Baseboard.json
@@ -90,4 +90,4 @@
"PartNumber": "$PRODUCT_PART_NUMBER",
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
-}
\ No newline at end of file
+}
diff --git a/configurations/Bellavista.json b/configurations/Bellavista.json
index 4875dec..3ac9c8c 100644
--- a/configurations/Bellavista.json
+++ b/configurations/Bellavista.json
@@ -1,32 +1,32 @@
{
"Exposes": [
{
- "Name": "Power Supply Slot 0",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 104,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps0"
+ "Name": "Power Supply Slot 0",
+ "NamedPresenceGpio": "presence-ps0",
+ "Type": "IBMCFFPSConnector"
},
{
- "Name": "Power Supply Slot 1",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 105,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps1"
+ "Name": "Power Supply Slot 1",
+ "NamedPresenceGpio": "presence-ps1",
+ "Type": "IBMCFFPSConnector"
},
{
- "Name": "Power Supply Slot 2",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 106,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps2"
+ "Name": "Power Supply Slot 2",
+ "NamedPresenceGpio": "presence-ps2",
+ "Type": "IBMCFFPSConnector"
},
{
- "Name": "Power Supply Slot 3",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 107,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps3"
+ "Name": "Power Supply Slot 3",
+ "NamedPresenceGpio": "presence-ps3",
+ "Type": "IBMCFFPSConnector"
},
{
"Address": "0x11",
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index 0db8e8c..a571957 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -149,4 +149,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/Everest.json b/configurations/Everest.json
index 2859248..fa855ff 100644
--- a/configurations/Everest.json
+++ b/configurations/Everest.json
@@ -2,10 +2,10 @@
"Exposes": [
{
"Name": "Compatible System",
- "Type": "IBMCompatibleSystem",
"Names": [
"ibm,everest"
- ]
+ ],
+ "Type": "IBMCompatibleSystem"
}
],
"Name": "Everest Chassis",
diff --git a/configurations/F1U12X25 HSBP.json b/configurations/F1U12X25 HSBP.json
index 3de06f0..0ea3ccf 100644
--- a/configurations/F1U12X25 HSBP.json
+++ b/configurations/F1U12X25 HSBP.json
@@ -48,4 +48,4 @@
"PartNumber": "$BOARD_PART_NUMBER",
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
-}
\ No newline at end of file
+}
diff --git a/configurations/F1U4X25 HSBP.json b/configurations/F1U4X25 HSBP.json
index af4f4f9..5161f0d 100644
--- a/configurations/F1U4X25 HSBP.json
+++ b/configurations/F1U4X25 HSBP.json
@@ -48,4 +48,4 @@
"PartNumber": "$BOARD_PART_NUMBER",
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
-}
\ No newline at end of file
+}
diff --git a/configurations/F2U12X35 HSBP.json b/configurations/F2U12X35 HSBP.json
index 78253c1..15fd714 100644
--- a/configurations/F2U12X35 HSBP.json
+++ b/configurations/F2U12X35 HSBP.json
@@ -48,4 +48,4 @@
"PartNumber": "$BOARD_PART_NUMBER",
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
-}
\ No newline at end of file
+}
diff --git a/configurations/F2U8X25 HSBP.json b/configurations/F2U8X25 HSBP.json
index 3af8345..c6c7678 100644
--- a/configurations/F2U8X25 HSBP.json
+++ b/configurations/F2U8X25 HSBP.json
@@ -152,4 +152,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index 9282fab..1d187de 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -149,4 +149,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/IBM 1000W CFFPS.json b/configurations/IBM 1000W CFFPS.json
index 6129f8a..caa1fba 100644
--- a/configurations/IBM 1000W CFFPS.json
+++ b/configurations/IBM 1000W CFFPS.json
@@ -1,6 +1,5 @@
{
- "Exposes": [
- ],
+ "Exposes": [],
"Name": "IBM 1000W CFFPS $index",
"Probe": [
"xyz.openbmc_project.Inventory.Decorator.Asset({'Model': '2B1D'})",
diff --git a/configurations/IBM 1400W CFFPS.json b/configurations/IBM 1400W CFFPS.json
index e098021..480afbe 100644
--- a/configurations/IBM 1400W CFFPS.json
+++ b/configurations/IBM 1400W CFFPS.json
@@ -1,6 +1,5 @@
{
- "Exposes": [
- ],
+ "Exposes": [],
"Name": "IBM 1400W CFFPS $index",
"Probe": [
"xyz.openbmc_project.Inventory.Decorator.Asset({'Model': '2B1E'})"
diff --git a/configurations/IBM 1600W CFFPS.json b/configurations/IBM 1600W CFFPS.json
index c2bc523..09cbd91 100644
--- a/configurations/IBM 1600W CFFPS.json
+++ b/configurations/IBM 1600W CFFPS.json
@@ -1,6 +1,5 @@
{
- "Exposes": [
- ],
+ "Exposes": [],
"Name": "IBM 1600W CFFPS $index",
"Probe": [
"xyz.openbmc_project.Inventory.Decorator.Asset({'Model': '2B1E'})"
diff --git a/configurations/IBM 2000W CFFPS.json b/configurations/IBM 2000W CFFPS.json
index 5156dc8..3cfa70c 100644
--- a/configurations/IBM 2000W CFFPS.json
+++ b/configurations/IBM 2000W CFFPS.json
@@ -1,6 +1,5 @@
{
- "Exposes": [
- ],
+ "Exposes": [],
"Name": "IBM 2000W CFFPS $index",
"Probe": [
"xyz.openbmc_project.Inventory.Decorator.Asset({'Model': '51E9'})"
diff --git a/configurations/IBM 2300W CFFPS.json b/configurations/IBM 2300W CFFPS.json
index 39ba88c..94f92c4 100644
--- a/configurations/IBM 2300W CFFPS.json
+++ b/configurations/IBM 2300W CFFPS.json
@@ -1,6 +1,5 @@
{
- "Exposes": [
- ],
+ "Exposes": [],
"Name": "IBM 2300W CFFPS $index",
"Probe": [
"xyz.openbmc_project.Inventory.Decorator.Asset({'Model': '51EA'})"
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index ca62e01..ade49fa 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -53,4 +53,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
},
"xyz.openbmc_project.Inventory.Item.Panel": {}
-}
\ No newline at end of file
+}
diff --git a/configurations/NVME P4000.json b/configurations/NVME P4000.json
index 9c1cb70..a75e87a 100644
--- a/configurations/NVME P4000.json
+++ b/configurations/NVME P4000.json
@@ -51,4 +51,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
},
"xyz.openbmc_project.Inventory.Item.Chassis": {}
-}
\ No newline at end of file
+}
diff --git a/configurations/Nisqually.json b/configurations/Nisqually.json
index c281822..4f22368 100644
--- a/configurations/Nisqually.json
+++ b/configurations/Nisqually.json
@@ -1,32 +1,32 @@
{
"Exposes": [
{
- "Name": "Power Supply Slot 0",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 104,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps0"
+ "Name": "Power Supply Slot 0",
+ "NamedPresenceGpio": "presence-ps0",
+ "Type": "IBMCFFPSConnector"
},
{
- "Name": "Power Supply Slot 1",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 105,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps1"
+ "Name": "Power Supply Slot 1",
+ "NamedPresenceGpio": "presence-ps1",
+ "Type": "IBMCFFPSConnector"
},
{
- "Name": "Power Supply Slot 2",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 106,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps2"
+ "Name": "Power Supply Slot 2",
+ "NamedPresenceGpio": "presence-ps2",
+ "Type": "IBMCFFPSConnector"
},
{
- "Name": "Power Supply Slot 3",
- "Type": "IBMCFFPSConnector",
"I2CAddress": 107,
"I2CBus": 3,
- "NamedPresenceGpio": "presence-ps3"
+ "Name": "Power Supply Slot 3",
+ "NamedPresenceGpio": "presence-ps3",
+ "Type": "IBMCFFPSConnector"
},
{
"Address": "0x48",
@@ -35,12 +35,6 @@
"Type": "TMP75"
},
{
- "Address": "0x11",
- "Bus": 8,
- "Name": "UCD90320 Power Sequencer",
- "Type": "UCD90320"
- },
- {
"Address": "0x48",
"Bus": 8,
"Name": "PCIE 0 Temp",
@@ -51,6 +45,12 @@
"Bus": 8,
"Name": "PCIE 1 Temp",
"Type": "TMP75"
+ },
+ {
+ "Address": "0x11",
+ "Bus": 8,
+ "Name": "UCD90320 Power Sequencer",
+ "Type": "UCD90320"
}
],
"Name": "Nisqually Backplane",
diff --git a/configurations/PCIE SSD Retimer.json b/configurations/PCIE SSD Retimer.json
index b065e70..d743fa5 100644
--- a/configurations/PCIE SSD Retimer.json
+++ b/configurations/PCIE SSD Retimer.json
@@ -22,4 +22,4 @@
"PartNumber": "$BOARD_PART_NUMBER",
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
-}
\ No newline at end of file
+}
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index a77b94e..345d16a 100644
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -124,4 +124,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/PSSF162205A.json b/configurations/PSSF162205A.json
index 209dce9..99f400c 100644
--- a/configurations/PSSF162205A.json
+++ b/configurations/PSSF162205A.json
@@ -124,4 +124,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/PSSF212201A.json b/configurations/PSSF212201A.json
index 0dfb370..3625a65 100644
--- a/configurations/PSSF212201A.json
+++ b/configurations/PSSF212201A.json
@@ -124,4 +124,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/PSSF222201A.json b/configurations/PSSF222201A.json
index a853bf5..bfad8cf 100644
--- a/configurations/PSSF222201A.json
+++ b/configurations/PSSF222201A.json
@@ -124,4 +124,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 108a509..add657a 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -628,4 +628,4 @@
"AssetTag": "$PRODUCT_ASSET_TAG"
},
"xyz.openbmc_project.Inventory.Item.System": {}
-}
\ No newline at end of file
+}
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index 778a0fc..406815a 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -526,4 +526,4 @@
"AssetTag": "$PRODUCT_ASSET_TAG"
},
"xyz.openbmc_project.Inventory.Item.System": {}
-}
\ No newline at end of file
+}
diff --git a/configurations/Rainier 1S4U Chassis.json b/configurations/Rainier 1S4U Chassis.json
index b381585..8587ecd 100644
--- a/configurations/Rainier 1S4U Chassis.json
+++ b/configurations/Rainier 1S4U Chassis.json
@@ -2,11 +2,11 @@
"Exposes": [
{
"Name": "Compatible System",
- "Type": "IBMCompatibleSystem",
"Names": [
"ibm,rainier-1s4u",
"ibm,rainier"
- ]
+ ],
+ "Type": "IBMCompatibleSystem"
}
],
"Name": "Rainier 1S4U Chassis",
diff --git a/configurations/Rainier 2U Chassis.json b/configurations/Rainier 2U Chassis.json
index 2ed3f30..051d88e 100644
--- a/configurations/Rainier 2U Chassis.json
+++ b/configurations/Rainier 2U Chassis.json
@@ -2,11 +2,11 @@
"Exposes": [
{
"Name": "Compatible System",
- "Type": "IBMCompatibleSystem",
"Names": [
"ibm,rainier-2u",
"ibm,rainier"
- ]
+ ],
+ "Type": "IBMCompatibleSystem"
}
],
"Name": "Rainier 2U Chassis",
diff --git a/configurations/Rainier 4U Chassis.json b/configurations/Rainier 4U Chassis.json
index 814aa9a..3c65d8c 100644
--- a/configurations/Rainier 4U Chassis.json
+++ b/configurations/Rainier 4U Chassis.json
@@ -2,11 +2,11 @@
"Exposes": [
{
"Name": "Compatible System",
- "Type": "IBMCompatibleSystem",
"Names": [
"ibm,rainier-4u",
"ibm,rainier"
- ]
+ ],
+ "Type": "IBMCompatibleSystem"
}
],
"Name": "Rainier 4U Chassis",
diff --git a/configurations/SAS Module.json b/configurations/SAS Module.json
index 2571aeb..30e4b21 100644
--- a/configurations/SAS Module.json
+++ b/configurations/SAS Module.json
@@ -15,4 +15,4 @@
"Name": "SAS Module",
"Probe": "FALSE",
"Type": "Board"
-}
\ No newline at end of file
+}
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 4f01096..1451830 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -177,4 +177,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index d0bd3b9..44eb756 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -847,4 +847,4 @@
"PartNumber": "$PRODUCT_PART_NUMBER",
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
-}
\ No newline at end of file
+}
diff --git a/configurations/STP P4000 Chassis.json b/configurations/STP P4000 Chassis.json
index d7d93f1..4918c7f 100644
--- a/configurations/STP P4000 Chassis.json
+++ b/configurations/STP P4000 Chassis.json
@@ -137,4 +137,4 @@
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})"
],
"Type": "Chassis"
-}
\ No newline at end of file
+}
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index e43d123..fc5c45b 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1632,4 +1632,4 @@
"ProductId": 123
},
"xyz.openbmc_project.Inventory.Item.System": {}
-}
\ No newline at end of file
+}