Reformat and restructure board files

Author: maxgerhardt

boards/adafruit_feather.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_feather",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_feather",
         "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80f1",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Feather RP2040"
+        "usb_pid": "0x80f1"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
+}

boards/adafruit_itsybitsy.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_itsybitsy",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_itsybitsy",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80fd",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "ItsyBitsy RP2040"
+        "usb_pid": "0x80fd"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
+}

boards/adafruit_kb2040.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_kb2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_kb2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x8105",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "KB2040"
+        "usb_pid": "0x8105"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
+}

boards/adafruit_macropad2040.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_macropad2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_macropad2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x8107",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "MacroPad RP2040"
+        "usb_pid": "0x8107"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
+}

boards/adafruit_qtpy.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_qtpy",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_qtpy",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80f7",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "QT Py RP2040"
+        "usb_pid": "0x80f7"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
+}

boards/adafruit_stemmafriend.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_stemmafriend",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_stemmafriend",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x80e3",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "STEMMA Friend RP2040"
+        "usb_pid": "0x80e3"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
+}

boards/adafruit_trinkeyrp2040qt.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "adafruit_trinkeyrp2040qt",
     "arduino": {
       "earlephilhower": {
-        "variant": "adafruit_trinkeyrp2040qt",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x239a",
-        "usb_pid": "0x8109",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Trinkey RP2040 QT"
+        "usb_pid": "0x8109"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Adafruit"
-}
+}

boards/arduino_nano_connect.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "arduino_nano_connect",
     "arduino": {
       "earlephilhower": {
-        "variant": "arduino_nano_connect",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2341",
-        "usb_pid": "0x0058",
-        "usb_manufacturer": "Arduino",
-        "usb_product": "Nano RP2040 Connect"
+        "usb_pid": "0x0058"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Arduino"
-}
+}

boards/challenger_2040_lora.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "challenger_2040_lora",
     "arduino": {
       "earlephilhower": {
-        "variant": "challenger_2040_lora",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1023",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LoRa"
+        "usb_pid": "0x1023"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
+}

boards/challenger_2040_lte.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "challenger_2040_lte",
     "arduino": {
       "earlephilhower": {
-        "variant": "challenger_2040_lte",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x100b",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LTE"
+        "usb_pid": "0x100b"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
+}