Reformat and restructure board files

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_pid": "0x80f1"
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Feather RP2040"
       }
     }
   },
@@ -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_pid": "0x80fd"
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "ItsyBitsy RP2040"
       }
     }
   },
@@ -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_pid": "0x8105"
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "KB2040"
       }
     }
   },
@@ -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_pid": "0x8107"
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "MacroPad RP2040"
       }
     }
   },
@@ -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_pid": "0x80f7"
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "QT Py RP2040"
       }
     }
   },
@@ -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_pid": "0x80e3"
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "STEMMA Friend RP2040"
       }
     }
   },
@@ -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_pid": "0x8109"
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Trinkey RP2040 QT"
       }
     }
   },
@@ -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_pid": "0x0058"
-        "usb_manufacturer": "Arduino",
-        "usb_product": "Nano RP2040 Connect"
       }
     }
   },
@@ -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_pid": "0x1023"
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LoRa"
       }
     }
   },
@@ -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_pid": "0x100b"
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LTE"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "iLabs"
-}
+}

boards/challenger_2040_wifi.json

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

boards/challenger_2040_wifi_ble.json

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

boards/challenger_nb_2040_wifi.json

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

boards/cytron_maker_nano_rp2040.json

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

boards/cytron_maker_pi_rp2040.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "cytron_maker_pi_rp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "cytron_maker_pi_rp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1000",
+        "usb_pid": "0x1000"
-        "usb_manufacturer": "Cytron",
-        "usb_product": "Maker Pi RP2040"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Cytron"
-}
+}

boards/dfrobot_beetle_rp2040.json

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

boards/flyboard2040_core.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "flyboard2040_core",
     "arduino": {
       "earlephilhower": {
-        "variant": "flyboard2040_core",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x008a",
+        "usb_pid": "0x008a"
-        "usb_manufacturer": "DeRuiLab",
-        "usb_product": "FlyBoard2040Core"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "DeRuiLab"
-}
+}

boards/generic.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "generic",
     "arduino": {
       "earlephilhower": {
-        "variant": "generic",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0xf00a",
+        "usb_pid": "0xf00a"
-        "usb_manufacturer": "Generic",
-        "usb_product": "RP2040"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Generic"
-}
+}

boards/ilabs_rpico32.json

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

boards/melopero_shake_rp2040.json

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

boards/rpipico.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "rpipico",
     "arduino": {
       "earlephilhower": {
-        "variant": "rpipico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x000a",
+        "usb_pid": "0x000a"
-        "usb_manufacturer": "Raspberry Pi",
-        "usb_product": "Pico"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Raspberry Pi"
-}
+}

boards/seeed_xiao_rp2040.json

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

boards/solderparty_rp2040_stamp.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "solderparty_rp2040_stamp",
     "arduino": {
       "earlephilhower": {
-        "variant": "solderparty_rp2040_stamp",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x1209",
-        "usb_pid": "0xa182",
+        "usb_pid": "0xa182"
-        "usb_manufacturer": "Solder Party",
-        "usb_product": "RP2040 Stamp"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "Solder Party"
-}
+}

boards/sparkfun_promicrorp2040.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "sparkfun_promicrorp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "sparkfun_promicrorp2040",
         "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
         "usb_vid": "0x1b4f",
-        "usb_pid": "0x0026",
+        "usb_pid": "0x0026"
-        "usb_manufacturer": "SparkFun",
-        "usb_product": "ProMicro RP2040"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "SparkFun"
-}
+}

boards/sparkfun_thingplusrp2040.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "sparkfun_thingplusrp2040",
     "arduino": {
       "earlephilhower": {
-        "variant": "sparkfun_thingplusrp2040",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x1b4f",
-        "usb_pid": "0x0026",
+        "usb_pid": "0x0026"
-        "usb_manufacturer": "SparkFun",
-        "usb_product": "Thing Plus RP2040"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "SparkFun"
-}
+}

boards/upesy_rp2040_devkit.json

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

boards/wiznet_5100s_evb_pico.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "wiznet_5100s_evb_pico",
     "arduino": {
       "earlephilhower": {
-        "variant": "wiznet_5100s_evb_pico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1027",
+        "usb_pid": "0x1027"
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "W5100S-EVB-Pico"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "WIZnet"
-}
+}

boards/wiznet_5500_evb_pico.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "wiznet_5500_evb_pico",
     "arduino": {
       "earlephilhower": {
-        "variant": "wiznet_5500_evb_pico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1029",
+        "usb_pid": "0x1029"
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "W5500-EVB-Pico"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "WIZnet"
-}
+}

boards/wiznet_wizfi360_evb_pico.json

@@ -11,14 +11,12 @@
       ]
     ],
     "mcu": "rp2040",
+    "variant": "wiznet_wizfi360_evb_pico",
     "arduino": {
       "earlephilhower": {
-        "variant": "wiznet_wizfi360_evb_pico",
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
         "usb_vid": "0x2e8a",
-        "usb_pid": "0x1028",
+        "usb_pid": "0x1028"
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "WizFi360-EVB-Pico"
       }
     }
   },
@@ -49,4 +47,4 @@
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
   "vendor": "WIZnet"
-}
+}