Merge pull request #9 from maxgerhardt/patchup

Second round of fixups
maxgerhardt · Jun 17, 2022 · e0781a4 · e0781a4
2 parents baf2bf2 + 9177e55
commit e0781a4
Show file tree

Hide file tree

Showing 33 changed files with 333 additions and 338 deletions.
diff --git a/boards/adafruit_feather.json b/boards/adafruit_feather.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80f1"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "adafruit_feather",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80f1"
-      }
-    }
+    "variant": "adafruit_feather"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/adafruit_itsybitsy.json b/boards/adafruit_itsybitsy.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80fd"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_ADAFRUIT_ITSYBITSY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "adafruit_itsybitsy",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80fd"
-      }
-    }
+    "variant": "adafruit_itsybitsy"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/adafruit_kb2040.json b/boards/adafruit_kb2040.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x8105"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_ADAFRUIT_KB2040_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "adafruit_kb2040",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x8105"
-      }
-    }
+    "variant": "adafruit_kb2040"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/adafruit_macropad2040.json b/boards/adafruit_macropad2040.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x8107"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_ADAFRUIT_MACROPAD_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "adafruit_macropad2040",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x8107"
-      }
-    }
+    "variant": "adafruit_macropad2040"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/adafruit_qtpy.json b/boards/adafruit_qtpy.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80f7"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_ADAFRUIT_QTPY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "adafruit_qtpy",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80f7"
-      }
-    }
+    "variant": "adafruit_qtpy"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/adafruit_stemmafriend.json b/boards/adafruit_stemmafriend.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80e3"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_ADAFRUIT_STEMMAFRIEND_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "adafruit_stemmafriend",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80e3"
-      }
-    }
+    "variant": "adafruit_stemmafriend"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/adafruit_trinkeyrp2040qt.json b/boards/adafruit_trinkeyrp2040qt.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x8109"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_ADAFRUIT_TRINKEYQT_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "adafruit_trinkeyrp2040qt",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x8109"
-      }
-    }
+    "variant": "adafruit_trinkeyrp2040qt"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/arduino_nano_connect.json b/boards/arduino_nano_connect.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2341",
+        "usb_pid": "0x0058"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_NANO_RP2040_CONNECT -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "arduino_nano_connect",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2341",
-        "usb_pid": "0x0058"
-      }
-    }
+    "variant": "arduino_nano_connect"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/challenger_2040_lora.json b/boards/challenger_2040_lora.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1023"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_CHALLENGER_2040_LORA_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "challenger_2040_lora",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1023"
-      }
-    }
+    "variant": "challenger_2040_lora"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/challenger_2040_lte.json b/boards/challenger_2040_lte.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x100b"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_CHALLENGER_2040_LTE_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "challenger_2040_lte",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x100b"
-      }
-    }
+    "variant": "challenger_2040_lte"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/challenger_2040_wifi.json b/boards/challenger_2040_wifi.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1006"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_CHALLENGER_2040_WIFI_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "challenger_2040_wifi",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1006"
-      }
-    }
+    "variant": "challenger_2040_wifi"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/challenger_2040_wifi_ble.json b/boards/challenger_2040_wifi_ble.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x102C"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_CHALLENGER_2040_WIFI_BLE_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "challenger_2040_wifi_ble",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x102C"
-      }
-    }
+    "variant": "challenger_2040_wifi_ble"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",

diff --git a/boards/challenger_nb_2040_wifi.json b/boards/challenger_nb_2040_wifi.json
@@ -1,5 +1,12 @@
 {
   "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x100b"
+      }
+    },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D ARDUINO_CHALLENGER_NB_2040_WIFI_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,14 +18,7 @@
       ]
     ],
     "mcu": "rp2040",
-    "variant": "challenger_nb_2040_wifi",
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x100b"
-      }
-    }
+    "variant": "challenger_nb_2040_wifi"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",