Add warning not to edit boards.txt (#383)

* Remove redundant/wrong second board.mcu in boards.txt

Fixes #380

Boards.txt had the setting board.mcu twice.  The first one was correct,
while the second one wasn't and shouldn't have been there.  Remove it.

* Include fix from @rei-vilo in #381

boards.txt

@@ -1,3 +1,7 @@
+# WARNING - DO NOT EDIT THIS FILE, IT IS MACHINE GENERATED
+#           To change something here, edit tools/makeboards.py and
+#           run 'python3 makeboards.py > ../boards.txt' to regenerate
+
 menu.BoardModel=Model
 menu.flash=Flash Size
 menu.freq=CPU Speed
@@ -29,7 +33,6 @@ rpipico.serial.disableRTS=false
 rpipico.build.f_cpu=125000000
 rpipico.build.led=
 rpipico.build.core=rp2040
-rpipico.build.mcu=rp2040
 rpipico.build.ldscript=memmap_default.ld
 rpipico.build.ram_length=256k
 rpipico.build.boot2=boot2_w25q080_2_padded_checksum
@@ -157,7 +160,6 @@ rpipicopicoprobe.serial.disableRTS=false
 rpipicopicoprobe.build.f_cpu=125000000
 rpipicopicoprobe.build.led=
 rpipicopicoprobe.build.core=rp2040
-rpipicopicoprobe.build.mcu=rp2040
 rpipicopicoprobe.build.ldscript=memmap_default.ld
 rpipicopicoprobe.build.ram_length=256k
 rpipicopicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -285,7 +287,6 @@ rpipicopicodebug.serial.disableRTS=false
 rpipicopicodebug.build.f_cpu=125000000
 rpipicopicodebug.build.led=
 rpipicopicodebug.build.core=rp2040
-rpipicopicodebug.build.mcu=rp2040
 rpipicopicodebug.build.ldscript=memmap_default.ld
 rpipicopicodebug.build.ram_length=240k
 rpipicopicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -411,7 +412,6 @@ adafruit_feather.serial.disableRTS=false
 adafruit_feather.build.f_cpu=125000000
 adafruit_feather.build.led=
 adafruit_feather.build.core=rp2040
-adafruit_feather.build.mcu=rp2040
 adafruit_feather.build.ldscript=memmap_default.ld
 adafruit_feather.build.ram_length=256k
 adafruit_feather.build.boot2=boot2_w25x10cl_4_padded_checksum
@@ -575,7 +575,6 @@ adafruit_featherpicoprobe.serial.disableRTS=false
 adafruit_featherpicoprobe.build.f_cpu=125000000
 adafruit_featherpicoprobe.build.led=
 adafruit_featherpicoprobe.build.core=rp2040
-adafruit_featherpicoprobe.build.mcu=rp2040
 adafruit_featherpicoprobe.build.ldscript=memmap_default.ld
 adafruit_featherpicoprobe.build.ram_length=256k
 adafruit_featherpicoprobe.build.boot2=boot2_w25x10cl_4_padded_checksum
@@ -739,7 +738,6 @@ adafruit_featherpicodebug.serial.disableRTS=false
 adafruit_featherpicodebug.build.f_cpu=125000000
 adafruit_featherpicodebug.build.led=
 adafruit_featherpicodebug.build.core=rp2040
-adafruit_featherpicodebug.build.mcu=rp2040
 adafruit_featherpicodebug.build.ldscript=memmap_default.ld
 adafruit_featherpicodebug.build.ram_length=240k
 adafruit_featherpicodebug.build.boot2=boot2_w25x10cl_4_padded_checksum
@@ -901,7 +899,6 @@ adafruit_itsybitsy.serial.disableRTS=false
 adafruit_itsybitsy.build.f_cpu=125000000
 adafruit_itsybitsy.build.led=
 adafruit_itsybitsy.build.core=rp2040
-adafruit_itsybitsy.build.mcu=rp2040
 adafruit_itsybitsy.build.ldscript=memmap_default.ld
 adafruit_itsybitsy.build.ram_length=256k
 adafruit_itsybitsy.build.boot2=boot2_w25q080_2_padded_checksum
@@ -1065,7 +1062,6 @@ adafruit_itsybitsypicoprobe.serial.disableRTS=false
 adafruit_itsybitsypicoprobe.build.f_cpu=125000000
 adafruit_itsybitsypicoprobe.build.led=
 adafruit_itsybitsypicoprobe.build.core=rp2040
-adafruit_itsybitsypicoprobe.build.mcu=rp2040
 adafruit_itsybitsypicoprobe.build.ldscript=memmap_default.ld
 adafruit_itsybitsypicoprobe.build.ram_length=256k
 adafruit_itsybitsypicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -1229,7 +1225,6 @@ adafruit_itsybitsypicodebug.serial.disableRTS=false
 adafruit_itsybitsypicodebug.build.f_cpu=125000000
 adafruit_itsybitsypicodebug.build.led=
 adafruit_itsybitsypicodebug.build.core=rp2040
-adafruit_itsybitsypicodebug.build.mcu=rp2040
 adafruit_itsybitsypicodebug.build.ldscript=memmap_default.ld
 adafruit_itsybitsypicodebug.build.ram_length=240k
 adafruit_itsybitsypicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -1391,7 +1386,6 @@ adafruit_qtpy.serial.disableRTS=false
 adafruit_qtpy.build.f_cpu=125000000
 adafruit_qtpy.build.led=
 adafruit_qtpy.build.core=rp2040
-adafruit_qtpy.build.mcu=rp2040
 adafruit_qtpy.build.ldscript=memmap_default.ld
 adafruit_qtpy.build.ram_length=256k
 adafruit_qtpy.build.boot2=boot2_w25q080_2_padded_checksum
@@ -1555,7 +1549,6 @@ adafruit_qtpypicoprobe.serial.disableRTS=false
 adafruit_qtpypicoprobe.build.f_cpu=125000000
 adafruit_qtpypicoprobe.build.led=
 adafruit_qtpypicoprobe.build.core=rp2040
-adafruit_qtpypicoprobe.build.mcu=rp2040
 adafruit_qtpypicoprobe.build.ldscript=memmap_default.ld
 adafruit_qtpypicoprobe.build.ram_length=256k
 adafruit_qtpypicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -1719,7 +1712,6 @@ adafruit_qtpypicodebug.serial.disableRTS=false
 adafruit_qtpypicodebug.build.f_cpu=125000000
 adafruit_qtpypicodebug.build.led=
 adafruit_qtpypicodebug.build.core=rp2040
-adafruit_qtpypicodebug.build.mcu=rp2040
 adafruit_qtpypicodebug.build.ldscript=memmap_default.ld
 adafruit_qtpypicodebug.build.ram_length=240k
 adafruit_qtpypicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -1881,7 +1873,6 @@ adafruit_stemmafriend.serial.disableRTS=false
 adafruit_stemmafriend.build.f_cpu=125000000
 adafruit_stemmafriend.build.led=
 adafruit_stemmafriend.build.core=rp2040
-adafruit_stemmafriend.build.mcu=rp2040
 adafruit_stemmafriend.build.ldscript=memmap_default.ld
 adafruit_stemmafriend.build.ram_length=256k
 adafruit_stemmafriend.build.boot2=boot2_w25q080_2_padded_checksum
@@ -2045,7 +2036,6 @@ adafruit_stemmafriendpicoprobe.serial.disableRTS=false
 adafruit_stemmafriendpicoprobe.build.f_cpu=125000000
 adafruit_stemmafriendpicoprobe.build.led=
 adafruit_stemmafriendpicoprobe.build.core=rp2040
-adafruit_stemmafriendpicoprobe.build.mcu=rp2040
 adafruit_stemmafriendpicoprobe.build.ldscript=memmap_default.ld
 adafruit_stemmafriendpicoprobe.build.ram_length=256k
 adafruit_stemmafriendpicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -2209,7 +2199,6 @@ adafruit_stemmafriendpicodebug.serial.disableRTS=false
 adafruit_stemmafriendpicodebug.build.f_cpu=125000000
 adafruit_stemmafriendpicodebug.build.led=
 adafruit_stemmafriendpicodebug.build.core=rp2040
-adafruit_stemmafriendpicodebug.build.mcu=rp2040
 adafruit_stemmafriendpicodebug.build.ldscript=memmap_default.ld
 adafruit_stemmafriendpicodebug.build.ram_length=240k
 adafruit_stemmafriendpicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -2371,7 +2360,6 @@ adafruit_trinkeyrp2040qt.serial.disableRTS=false
 adafruit_trinkeyrp2040qt.build.f_cpu=125000000
 adafruit_trinkeyrp2040qt.build.led=
 adafruit_trinkeyrp2040qt.build.core=rp2040
-adafruit_trinkeyrp2040qt.build.mcu=rp2040
 adafruit_trinkeyrp2040qt.build.ldscript=memmap_default.ld
 adafruit_trinkeyrp2040qt.build.ram_length=256k
 adafruit_trinkeyrp2040qt.build.boot2=boot2_w25q080_2_padded_checksum
@@ -2535,7 +2523,6 @@ adafruit_trinkeyrp2040qtpicoprobe.serial.disableRTS=false
 adafruit_trinkeyrp2040qtpicoprobe.build.f_cpu=125000000
 adafruit_trinkeyrp2040qtpicoprobe.build.led=
 adafruit_trinkeyrp2040qtpicoprobe.build.core=rp2040
-adafruit_trinkeyrp2040qtpicoprobe.build.mcu=rp2040
 adafruit_trinkeyrp2040qtpicoprobe.build.ldscript=memmap_default.ld
 adafruit_trinkeyrp2040qtpicoprobe.build.ram_length=256k
 adafruit_trinkeyrp2040qtpicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -2699,7 +2686,6 @@ adafruit_trinkeyrp2040qtpicodebug.serial.disableRTS=false
 adafruit_trinkeyrp2040qtpicodebug.build.f_cpu=125000000
 adafruit_trinkeyrp2040qtpicodebug.build.led=
 adafruit_trinkeyrp2040qtpicodebug.build.core=rp2040
-adafruit_trinkeyrp2040qtpicodebug.build.mcu=rp2040
 adafruit_trinkeyrp2040qtpicodebug.build.ldscript=memmap_default.ld
 adafruit_trinkeyrp2040qtpicodebug.build.ram_length=240k
 adafruit_trinkeyrp2040qtpicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -2861,7 +2847,6 @@ adafruit_macropad2040.serial.disableRTS=false
 adafruit_macropad2040.build.f_cpu=125000000
 adafruit_macropad2040.build.led=
 adafruit_macropad2040.build.core=rp2040
-adafruit_macropad2040.build.mcu=rp2040
 adafruit_macropad2040.build.ldscript=memmap_default.ld
 adafruit_macropad2040.build.ram_length=256k
 adafruit_macropad2040.build.boot2=boot2_w25q080_2_padded_checksum
@@ -3025,7 +3010,6 @@ adafruit_macropad2040picoprobe.serial.disableRTS=false
 adafruit_macropad2040picoprobe.build.f_cpu=125000000
 adafruit_macropad2040picoprobe.build.led=
 adafruit_macropad2040picoprobe.build.core=rp2040
-adafruit_macropad2040picoprobe.build.mcu=rp2040
 adafruit_macropad2040picoprobe.build.ldscript=memmap_default.ld
 adafruit_macropad2040picoprobe.build.ram_length=256k
 adafruit_macropad2040picoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -3189,7 +3173,6 @@ adafruit_macropad2040picodebug.serial.disableRTS=false
 adafruit_macropad2040picodebug.build.f_cpu=125000000
 adafruit_macropad2040picodebug.build.led=
 adafruit_macropad2040picodebug.build.core=rp2040
-adafruit_macropad2040picodebug.build.mcu=rp2040
 adafruit_macropad2040picodebug.build.ldscript=memmap_default.ld
 adafruit_macropad2040picodebug.build.ram_length=240k
 adafruit_macropad2040picodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -3351,7 +3334,6 @@ arduino_nano_connect.serial.disableRTS=false
 arduino_nano_connect.build.f_cpu=125000000
 arduino_nano_connect.build.led=
 arduino_nano_connect.build.core=rp2040
-arduino_nano_connect.build.mcu=rp2040
 arduino_nano_connect.build.ldscript=memmap_default.ld
 arduino_nano_connect.build.ram_length=256k
 arduino_nano_connect.build.boot2=boot2_w25q080_2_padded_checksum
@@ -3563,7 +3545,6 @@ arduino_nano_connectpicoprobe.serial.disableRTS=false
 arduino_nano_connectpicoprobe.build.f_cpu=125000000
 arduino_nano_connectpicoprobe.build.led=
 arduino_nano_connectpicoprobe.build.core=rp2040
-arduino_nano_connectpicoprobe.build.mcu=rp2040
 arduino_nano_connectpicoprobe.build.ldscript=memmap_default.ld
 arduino_nano_connectpicoprobe.build.ram_length=256k
 arduino_nano_connectpicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -3775,7 +3756,6 @@ arduino_nano_connectpicodebug.serial.disableRTS=false
 arduino_nano_connectpicodebug.build.f_cpu=125000000
 arduino_nano_connectpicodebug.build.led=
 arduino_nano_connectpicodebug.build.core=rp2040
-arduino_nano_connectpicodebug.build.mcu=rp2040
 arduino_nano_connectpicodebug.build.ldscript=memmap_default.ld
 arduino_nano_connectpicodebug.build.ram_length=240k
 arduino_nano_connectpicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -3985,7 +3965,6 @@ cytron_maker_nano_rp2040.serial.disableRTS=false
 cytron_maker_nano_rp2040.build.f_cpu=125000000
 cytron_maker_nano_rp2040.build.led=
 cytron_maker_nano_rp2040.build.core=rp2040
-cytron_maker_nano_rp2040.build.mcu=rp2040
 cytron_maker_nano_rp2040.build.ldscript=memmap_default.ld
 cytron_maker_nano_rp2040.build.ram_length=256k
 cytron_maker_nano_rp2040.build.boot2=boot2_w25q080_2_padded_checksum
@@ -4113,7 +4092,6 @@ cytron_maker_nano_rp2040picoprobe.serial.disableRTS=false
 cytron_maker_nano_rp2040picoprobe.build.f_cpu=125000000
 cytron_maker_nano_rp2040picoprobe.build.led=
 cytron_maker_nano_rp2040picoprobe.build.core=rp2040
-cytron_maker_nano_rp2040picoprobe.build.mcu=rp2040
 cytron_maker_nano_rp2040picoprobe.build.ldscript=memmap_default.ld
 cytron_maker_nano_rp2040picoprobe.build.ram_length=256k
 cytron_maker_nano_rp2040picoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -4241,7 +4219,6 @@ cytron_maker_nano_rp2040picodebug.serial.disableRTS=false
 cytron_maker_nano_rp2040picodebug.build.f_cpu=125000000
 cytron_maker_nano_rp2040picodebug.build.led=
 cytron_maker_nano_rp2040picodebug.build.core=rp2040
-cytron_maker_nano_rp2040picodebug.build.mcu=rp2040
 cytron_maker_nano_rp2040picodebug.build.ldscript=memmap_default.ld
 cytron_maker_nano_rp2040picodebug.build.ram_length=240k
 cytron_maker_nano_rp2040picodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -4367,7 +4344,6 @@ cytron_maker_pi_rp2040.serial.disableRTS=false
 cytron_maker_pi_rp2040.build.f_cpu=125000000
 cytron_maker_pi_rp2040.build.led=
 cytron_maker_pi_rp2040.build.core=rp2040
-cytron_maker_pi_rp2040.build.mcu=rp2040
 cytron_maker_pi_rp2040.build.ldscript=memmap_default.ld
 cytron_maker_pi_rp2040.build.ram_length=256k
 cytron_maker_pi_rp2040.build.boot2=boot2_w25q080_2_padded_checksum
@@ -4495,7 +4471,6 @@ cytron_maker_pi_rp2040picoprobe.serial.disableRTS=false
 cytron_maker_pi_rp2040picoprobe.build.f_cpu=125000000
 cytron_maker_pi_rp2040picoprobe.build.led=
 cytron_maker_pi_rp2040picoprobe.build.core=rp2040
-cytron_maker_pi_rp2040picoprobe.build.mcu=rp2040
 cytron_maker_pi_rp2040picoprobe.build.ldscript=memmap_default.ld
 cytron_maker_pi_rp2040picoprobe.build.ram_length=256k
 cytron_maker_pi_rp2040picoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -4623,7 +4598,6 @@ cytron_maker_pi_rp2040picodebug.serial.disableRTS=false
 cytron_maker_pi_rp2040picodebug.build.f_cpu=125000000
 cytron_maker_pi_rp2040picodebug.build.led=
 cytron_maker_pi_rp2040picodebug.build.core=rp2040
-cytron_maker_pi_rp2040picodebug.build.mcu=rp2040
 cytron_maker_pi_rp2040picodebug.build.ldscript=memmap_default.ld
 cytron_maker_pi_rp2040picodebug.build.ram_length=240k
 cytron_maker_pi_rp2040picodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -4749,7 +4723,6 @@ sparkfun_promicrorp2040.serial.disableRTS=false
 sparkfun_promicrorp2040.build.f_cpu=125000000
 sparkfun_promicrorp2040.build.led=
 sparkfun_promicrorp2040.build.core=rp2040
-sparkfun_promicrorp2040.build.mcu=rp2040
 sparkfun_promicrorp2040.build.ldscript=memmap_default.ld
 sparkfun_promicrorp2040.build.ram_length=256k
 sparkfun_promicrorp2040.build.boot2=boot2_generic_03h_4_padded_checksum
@@ -4961,7 +4934,6 @@ sparkfun_promicrorp2040picoprobe.serial.disableRTS=false
 sparkfun_promicrorp2040picoprobe.build.f_cpu=125000000
 sparkfun_promicrorp2040picoprobe.build.led=
 sparkfun_promicrorp2040picoprobe.build.core=rp2040
-sparkfun_promicrorp2040picoprobe.build.mcu=rp2040
 sparkfun_promicrorp2040picoprobe.build.ldscript=memmap_default.ld
 sparkfun_promicrorp2040picoprobe.build.ram_length=256k
 sparkfun_promicrorp2040picoprobe.build.boot2=boot2_generic_03h_4_padded_checksum
@@ -5173,7 +5145,6 @@ sparkfun_promicrorp2040picodebug.serial.disableRTS=false
 sparkfun_promicrorp2040picodebug.build.f_cpu=125000000
 sparkfun_promicrorp2040picodebug.build.led=
 sparkfun_promicrorp2040picodebug.build.core=rp2040
-sparkfun_promicrorp2040picodebug.build.mcu=rp2040
 sparkfun_promicrorp2040picodebug.build.ldscript=memmap_default.ld
 sparkfun_promicrorp2040picodebug.build.ram_length=240k
 sparkfun_promicrorp2040picodebug.build.boot2=boot2_generic_03h_4_padded_checksum
@@ -5383,7 +5354,6 @@ generic.serial.disableRTS=false
 generic.build.f_cpu=125000000
 generic.build.led=
 generic.build.core=rp2040
-generic.build.mcu=rp2040
 generic.build.ldscript=memmap_default.ld
 generic.build.ram_length=256k
 generic.build.boot2=boot2_generic_03h_4_padded_checksum
@@ -5539,7 +5509,6 @@ genericpicoprobe.serial.disableRTS=false
 genericpicoprobe.build.f_cpu=125000000
 genericpicoprobe.build.led=
 genericpicoprobe.build.core=rp2040
-genericpicoprobe.build.mcu=rp2040
 genericpicoprobe.build.ldscript=memmap_default.ld
 genericpicoprobe.build.ram_length=256k
 genericpicoprobe.build.boot2=boot2_generic_03h_4_padded_checksum
@@ -5695,7 +5664,6 @@ genericpicodebug.serial.disableRTS=false
 genericpicodebug.build.f_cpu=125000000
 genericpicodebug.build.led=
 genericpicodebug.build.core=rp2040
-genericpicodebug.build.mcu=rp2040
 genericpicodebug.build.ldscript=memmap_default.ld
 genericpicodebug.build.ram_length=240k
 genericpicodebug.build.boot2=boot2_generic_03h_4_padded_checksum
@@ -5849,7 +5817,6 @@ challenger_2040_wifi.serial.disableRTS=false
 challenger_2040_wifi.build.f_cpu=125000000
 challenger_2040_wifi.build.led=
 challenger_2040_wifi.build.core=rp2040
-challenger_2040_wifi.build.mcu=rp2040
 challenger_2040_wifi.build.ldscript=memmap_default.ld
 challenger_2040_wifi.build.ram_length=256k
 challenger_2040_wifi.build.boot2=boot2_w25q080_2_padded_checksum
@@ -6013,7 +5980,6 @@ challenger_2040_wifipicoprobe.serial.disableRTS=false
 challenger_2040_wifipicoprobe.build.f_cpu=125000000
 challenger_2040_wifipicoprobe.build.led=
 challenger_2040_wifipicoprobe.build.core=rp2040
-challenger_2040_wifipicoprobe.build.mcu=rp2040
 challenger_2040_wifipicoprobe.build.ldscript=memmap_default.ld
 challenger_2040_wifipicoprobe.build.ram_length=256k
 challenger_2040_wifipicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -6177,7 +6143,6 @@ challenger_2040_wifipicodebug.serial.disableRTS=false
 challenger_2040_wifipicodebug.build.f_cpu=125000000
 challenger_2040_wifipicodebug.build.led=
 challenger_2040_wifipicodebug.build.core=rp2040
-challenger_2040_wifipicodebug.build.mcu=rp2040
 challenger_2040_wifipicodebug.build.ldscript=memmap_default.ld
 challenger_2040_wifipicodebug.build.ram_length=240k
 challenger_2040_wifipicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -6339,7 +6304,6 @@ challenger_2040_lte.serial.disableRTS=false
 challenger_2040_lte.build.f_cpu=125000000
 challenger_2040_lte.build.led=
 challenger_2040_lte.build.core=rp2040
-challenger_2040_lte.build.mcu=rp2040
 challenger_2040_lte.build.ldscript=memmap_default.ld
 challenger_2040_lte.build.ram_length=256k
 challenger_2040_lte.build.boot2=boot2_w25q080_2_padded_checksum
@@ -6503,7 +6467,6 @@ challenger_2040_ltepicoprobe.serial.disableRTS=false
 challenger_2040_ltepicoprobe.build.f_cpu=125000000
 challenger_2040_ltepicoprobe.build.led=
 challenger_2040_ltepicoprobe.build.core=rp2040
-challenger_2040_ltepicoprobe.build.mcu=rp2040
 challenger_2040_ltepicoprobe.build.ldscript=memmap_default.ld
 challenger_2040_ltepicoprobe.build.ram_length=256k
 challenger_2040_ltepicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -6667,7 +6630,6 @@ challenger_2040_ltepicodebug.serial.disableRTS=false
 challenger_2040_ltepicodebug.build.f_cpu=125000000
 challenger_2040_ltepicodebug.build.led=
 challenger_2040_ltepicodebug.build.core=rp2040
-challenger_2040_ltepicodebug.build.mcu=rp2040
 challenger_2040_ltepicodebug.build.ldscript=memmap_default.ld
 challenger_2040_ltepicodebug.build.ram_length=240k
 challenger_2040_ltepicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -6829,7 +6791,6 @@ challenger_nb_2040_wifi.serial.disableRTS=false
 challenger_nb_2040_wifi.build.f_cpu=125000000
 challenger_nb_2040_wifi.build.led=
 challenger_nb_2040_wifi.build.core=rp2040
-challenger_nb_2040_wifi.build.mcu=rp2040
 challenger_nb_2040_wifi.build.ldscript=memmap_default.ld
 challenger_nb_2040_wifi.build.ram_length=256k
 challenger_nb_2040_wifi.build.boot2=boot2_w25q080_2_padded_checksum
@@ -6993,7 +6954,6 @@ challenger_nb_2040_wifipicoprobe.serial.disableRTS=false
 challenger_nb_2040_wifipicoprobe.build.f_cpu=125000000
 challenger_nb_2040_wifipicoprobe.build.led=
 challenger_nb_2040_wifipicoprobe.build.core=rp2040
-challenger_nb_2040_wifipicoprobe.build.mcu=rp2040
 challenger_nb_2040_wifipicoprobe.build.ldscript=memmap_default.ld
 challenger_nb_2040_wifipicoprobe.build.ram_length=256k
 challenger_nb_2040_wifipicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -7157,7 +7117,6 @@ challenger_nb_2040_wifipicodebug.serial.disableRTS=false
 challenger_nb_2040_wifipicodebug.build.f_cpu=125000000
 challenger_nb_2040_wifipicodebug.build.led=
 challenger_nb_2040_wifipicodebug.build.core=rp2040
-challenger_nb_2040_wifipicodebug.build.mcu=rp2040
 challenger_nb_2040_wifipicodebug.build.ldscript=memmap_default.ld
 challenger_nb_2040_wifipicodebug.build.ram_length=240k
 challenger_nb_2040_wifipicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -7319,7 +7278,6 @@ ilabs_rpico32.serial.disableRTS=false
 ilabs_rpico32.build.f_cpu=125000000
 ilabs_rpico32.build.led=
 ilabs_rpico32.build.core=rp2040
-ilabs_rpico32.build.mcu=rp2040
 ilabs_rpico32.build.ldscript=memmap_default.ld
 ilabs_rpico32.build.ram_length=256k
 ilabs_rpico32.build.boot2=boot2_w25q080_2_padded_checksum
@@ -7483,7 +7441,6 @@ ilabs_rpico32picoprobe.serial.disableRTS=false
 ilabs_rpico32picoprobe.build.f_cpu=125000000
 ilabs_rpico32picoprobe.build.led=
 ilabs_rpico32picoprobe.build.core=rp2040
-ilabs_rpico32picoprobe.build.mcu=rp2040
 ilabs_rpico32picoprobe.build.ldscript=memmap_default.ld
 ilabs_rpico32picoprobe.build.ram_length=256k
 ilabs_rpico32picoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -7647,7 +7604,6 @@ ilabs_rpico32picodebug.serial.disableRTS=false
 ilabs_rpico32picodebug.build.f_cpu=125000000
 ilabs_rpico32picodebug.build.led=
 ilabs_rpico32picodebug.build.core=rp2040
-ilabs_rpico32picodebug.build.mcu=rp2040
 ilabs_rpico32picodebug.build.ldscript=memmap_default.ld
 ilabs_rpico32picodebug.build.ram_length=240k
 ilabs_rpico32picodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -7809,7 +7765,6 @@ melopero_shake_rp2040.serial.disableRTS=false
 melopero_shake_rp2040.build.f_cpu=125000000
 melopero_shake_rp2040.build.led=
 melopero_shake_rp2040.build.core=rp2040
-melopero_shake_rp2040.build.mcu=rp2040
 melopero_shake_rp2040.build.ldscript=memmap_default.ld
 melopero_shake_rp2040.build.ram_length=256k
 melopero_shake_rp2040.build.boot2=boot2_w25q080_2_padded_checksum
@@ -8021,7 +7976,6 @@ melopero_shake_rp2040picoprobe.serial.disableRTS=false
 melopero_shake_rp2040picoprobe.build.f_cpu=125000000
 melopero_shake_rp2040picoprobe.build.led=
 melopero_shake_rp2040picoprobe.build.core=rp2040
-melopero_shake_rp2040picoprobe.build.mcu=rp2040
 melopero_shake_rp2040picoprobe.build.ldscript=memmap_default.ld
 melopero_shake_rp2040picoprobe.build.ram_length=256k
 melopero_shake_rp2040picoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -8233,7 +8187,6 @@ melopero_shake_rp2040picodebug.serial.disableRTS=false
 melopero_shake_rp2040picodebug.build.f_cpu=125000000
 melopero_shake_rp2040picodebug.build.led=
 melopero_shake_rp2040picodebug.build.core=rp2040
-melopero_shake_rp2040picodebug.build.mcu=rp2040
 melopero_shake_rp2040picodebug.build.ldscript=memmap_default.ld
 melopero_shake_rp2040picodebug.build.ram_length=240k
 melopero_shake_rp2040picodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -8443,7 +8396,6 @@ upesy_rp2040_devkit.serial.disableRTS=false
 upesy_rp2040_devkit.build.f_cpu=125000000
 upesy_rp2040_devkit.build.led=
 upesy_rp2040_devkit.build.core=rp2040
-upesy_rp2040_devkit.build.mcu=rp2040
 upesy_rp2040_devkit.build.ldscript=memmap_default.ld
 upesy_rp2040_devkit.build.ram_length=256k
 upesy_rp2040_devkit.build.boot2=boot2_w25q080_2_padded_checksum
@@ -8571,7 +8523,6 @@ upesy_rp2040_devkitpicoprobe.serial.disableRTS=false
 upesy_rp2040_devkitpicoprobe.build.f_cpu=125000000
 upesy_rp2040_devkitpicoprobe.build.led=
 upesy_rp2040_devkitpicoprobe.build.core=rp2040
-upesy_rp2040_devkitpicoprobe.build.mcu=rp2040
 upesy_rp2040_devkitpicoprobe.build.ldscript=memmap_default.ld
 upesy_rp2040_devkitpicoprobe.build.ram_length=256k
 upesy_rp2040_devkitpicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -8699,7 +8650,6 @@ upesy_rp2040_devkitpicodebug.serial.disableRTS=false
 upesy_rp2040_devkitpicodebug.build.f_cpu=125000000
 upesy_rp2040_devkitpicodebug.build.led=
 upesy_rp2040_devkitpicodebug.build.core=rp2040
-upesy_rp2040_devkitpicodebug.build.mcu=rp2040
 upesy_rp2040_devkitpicodebug.build.ldscript=memmap_default.ld
 upesy_rp2040_devkitpicodebug.build.ram_length=240k
 upesy_rp2040_devkitpicodebug.build.boot2=boot2_w25q080_2_padded_checksum
@@ -8825,7 +8775,6 @@ wiznet_5100s_evb_pico.serial.disableRTS=false
 wiznet_5100s_evb_pico.build.f_cpu=125000000
 wiznet_5100s_evb_pico.build.led=
 wiznet_5100s_evb_pico.build.core=rp2040
-wiznet_5100s_evb_pico.build.mcu=rp2040
 wiznet_5100s_evb_pico.build.ldscript=memmap_default.ld
 wiznet_5100s_evb_pico.build.ram_length=256k
 wiznet_5100s_evb_pico.build.boot2=boot2_w25q080_2_padded_checksum
@@ -8953,7 +8902,6 @@ wiznet_5100s_evb_picopicoprobe.serial.disableRTS=false
 wiznet_5100s_evb_picopicoprobe.build.f_cpu=125000000
 wiznet_5100s_evb_picopicoprobe.build.led=
 wiznet_5100s_evb_picopicoprobe.build.core=rp2040
-wiznet_5100s_evb_picopicoprobe.build.mcu=rp2040
 wiznet_5100s_evb_picopicoprobe.build.ldscript=memmap_default.ld
 wiznet_5100s_evb_picopicoprobe.build.ram_length=256k
 wiznet_5100s_evb_picopicoprobe.build.boot2=boot2_w25q080_2_padded_checksum
@@ -9081,7 +9029,6 @@ wiznet_5100s_evb_picopicodebug.serial.disableRTS=false
 wiznet_5100s_evb_picopicodebug.build.f_cpu=125000000
 wiznet_5100s_evb_picopicodebug.build.led=
 wiznet_5100s_evb_picopicodebug.build.core=rp2040
-wiznet_5100s_evb_picopicodebug.build.mcu=rp2040
 wiznet_5100s_evb_picopicodebug.build.ldscript=memmap_default.ld
 wiznet_5100s_evb_picopicodebug.build.ram_length=240k
 wiznet_5100s_evb_picopicodebug.build.boot2=boot2_w25q080_2_padded_checksum

cores/rp2040/SerialUART.cpp

@@ -96,7 +96,9 @@ void SerialUART::begin(unsigned long baud, uint16_t config) {
     gpio_set_function(_tx, GPIO_FUNC_UART);
     gpio_set_function(_rx, GPIO_FUNC_UART);
     _running = true;
-    _peek = -1;
+    while (!_swFIFO.empty()) {
+        (void)_swFIFO.pop(); // Just throw out anything in our old FIFO
+    }
 }
 
 void SerialUART::end() {
@@ -107,20 +109,30 @@ void SerialUART::end() {
     _running = false;
 }
 
+// Transfers any data in the HW FIFO into our SW one, up to 32 bytes
+void SerialUART::_pumpFIFO() {
+    while ((_swFIFO.size() < 32) && (uart_is_readable(_uart))) {
+        _swFIFO.push(uart_getc(_uart));
+    }
+}
+
 int SerialUART::peek() {
     CoreMutex m(&_mutex);
     if (!_running || !m) {
         return -1;
     }
-    if (_peek >= 0) {
-        return _peek;
+    _pumpFIFO();
+    // If there's something in the FIFO now, just peek at it
+    if (_swFIFO.size()) {
+        return _swFIFO.front();
     }
+    // The SW FIFO is empty, read the HW one until the timeout
     if (uart_is_readable_within_us(_uart, _timeout * 1000)) {
-        _peek = uart_getc(_uart);
-    } else {
-        _peek = -1; // Timeout
+        // We got one char, put it in the FIFO (which will now have exactly 1 byte) and return it
+        _swFIFO.push(uart_getc(_uart));
+        return _swFIFO.front();
     }
-    return _peek;
+    return -1; // Nothing available before timeout
 }
 
 int SerialUART::read() {
@@ -128,16 +140,18 @@ int SerialUART::read() {
     if (!_running || !m) {
         return -1;
     }
-    if (_peek >= 0) {
-        int ret = _peek;
-        _peek = -1;
+    _pumpFIFO();
+    if (_swFIFO.size()) {
+        auto ret = _swFIFO.front();
+        _swFIFO.pop();
         return ret;
     }
+    // The SW FIFO is empty, read the HW one until the timeout
     if (uart_is_readable_within_us(_uart, _timeout * 1000)) {
+        // We got one char, return it (FIFO will still be empty
         return uart_getc(_uart);
-    } else {
-        return -1; // Timeout
     }
+    return -1; // Timeout
 }
 
 int SerialUART::available() {
@@ -145,7 +159,8 @@ int SerialUART::available() {
     if (!_running || !m) {
         return 0;
     }
-    return (uart_is_readable(_uart)) ? 1 : 0;
+    _pumpFIFO();
+    return _swFIFO.size();
 }
 
 int SerialUART::availableForWrite() {
@@ -153,6 +168,7 @@ int SerialUART::availableForWrite() {
     if (!_running || !m) {
         return 0;
     }
+    _pumpFIFO();
     return (uart_is_writable(_uart)) ? 1 : 0;
 }
 
@@ -161,6 +177,7 @@ void SerialUART::flush() {
     if (!_running || !m) {
         return;
     }
+    _pumpFIFO();
     uart_tx_wait_blocking(_uart);
 }
 
@@ -169,6 +186,7 @@ size_t SerialUART::write(uint8_t c) {
     if (!_running || !m) {
         return 0;
     }
+    _pumpFIFO();
     uart_putc_raw(_uart, c);
     return 1;
 }
@@ -178,6 +196,7 @@ size_t SerialUART::write(const uint8_t *p, size_t len) {
     if (!_running || !m) {
         return 0;
     }
+    _pumpFIFO();
     size_t cnt = len;
     while (cnt) {
         uart_putc_raw(_uart, *p);

cores/rp2040/SerialUART.h

@@ -23,6 +23,7 @@
 #include <Arduino.h>
 #include "api/HardwareSerial.h"
 #include <stdarg.h>
+#include <queue>
 #include "CoreMutex.h"
 
 extern "C" typedef struct uart_inst uart_inst_t;
@@ -61,8 +62,10 @@ private:
     uart_inst_t *_uart;
     pin_size_t _tx, _rx;
     int _baud;
-    int _peek;
     mutex_t _mutex;
+
+    void _pumpFIFO();
+    std::queue<uint8_t> _swFIFO;
 };
 
 extern SerialUART Serial1; // HW UART 0

lib/pico_base/pico/version.h

@@ -12,8 +12,8 @@
 #define _PICO_VERSION_H
 
 #define PICO_SDK_VERSION_MAJOR    1
-#define PICO_SDK_VERSION_MINOR    2
+#define PICO_SDK_VERSION_MINOR    3
 #define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "1.2.0"
+#define PICO_SDK_VERSION_STRING   "1.3.0"
 
 #endif

package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinopico",
-  "version": "1.10905.0",
+  "version": "1.10909.0",
   "description": "Arduino Wiring-based Framework (RPi Pico RP2040)",
   "keywords": [
     "framework",

platform.txt

@@ -29,6 +29,8 @@ runtime.tools.pqt-elf2uf2.path={runtime.platform.path}/system/elf2uf2
 
 compiler.path={runtime.tools.pqt-gcc.path}/bin/
 
+compiler.libraries.ldflags=
+
 # Compile variables
 # -----------------
 
@@ -116,7 +118,7 @@ recipe.hooks.linking.prelink.1.pattern="{runtime.tools.pqt-python3.path}/python3
 recipe.hooks.linking.prelink.2.pattern="{compiler.path}{compiler.S.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -c "{runtime.platform.path}/boot2/{build.boot2}.S" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" -o "{build.path}/boot2.o"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.ldflags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" "{build.path}/boot2.o" {compiler.libpico} -lm -lc {compiler.libstdcpp} -lc -Wl,--end-group
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.ldflags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" "{build.path}/boot2.o" {compiler.libraries.ldflags} {compiler.libpico} -lm -lc {compiler.libstdcpp} -lc -Wl,--end-group
 
 ## Create output (UF2 file)
 recipe.objcopy.uf2.pattern="{runtime.tools.pqt-elf2uf2.path}/elf2uf2" "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.uf2"

tools/libpico/make-libpico.sh

@@ -23,6 +23,7 @@ for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
         arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
                          -DNDEBUG -DPICO_FLASH_SPI_CLKDIV=$div \
                          -c "$PICO_SDK_PATH/src/rp2_common/boot_stage2/$type.S" \
+                         -I "$PICO_SDK_PATH/src/boards/include/boards/" \
                          -I "$PICO_SDK_PATH/src/rp2040/hardware_regs/include/" \
                          -I "$PICO_SDK_PATH/src/rp2_common/pico_platform/include/" \
                          -I "$PICO_SDK_PATH/src/rp2_common/boot_stage2/asminclude/" \

tools/libpico/pico_extras_import.cmake

@@ -26,14 +26,14 @@ if (NOT PICO_EXTRAS_PATH)
             get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_EXTRAS_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
         endif ()
         FetchContent_Declare(
-                PICO_EXTRAS
+                pico_extras
                 GIT_REPOSITORY https://github.com/raspberrypi/pico-extras
                 GIT_TAG master
         )
-        if (NOT PICO_EXTRAS)
-            message("Downloading PICO EXTRAS")
-            FetchContent_Populate(PICO_EXTRAS)
-            set(PICO_EXTRAS_PATH ${PICO_EXTRAS_SOURCE_DIR})
+        if (NOT pico_extras)
+            message("Downloading Raspberry Pi Pico Extras")
+            FetchContent_Populate(pico_extras)
+            set(PICO_EXTRAS_PATH ${pico_extras_SOURCE_DIR})
         endif ()
         set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
     else ()
@@ -59,4 +59,4 @@ endif ()
 
 set(PICO_EXTRAS_PATH ${PICO_EXTRAS_PATH} CACHE PATH "Path to the PICO EXTRAS" FORCE)
 
-add_subdirectory(${PICO_EXTRAS_PATH} pico_extras)
+add_subdirectory(${PICO_EXTRAS_PATH} pico_extras)

tools/libpico/pico_sdk_import.cmake

@@ -3,8 +3,6 @@
 # This can be dropped into an external project to help locate this SDK
 # It should be include()ed prior to project()
 
-# todo document
-
 if (DEFINED ENV{PICO_SDK_PATH} AND (NOT PICO_SDK_PATH))
     set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})
     message("Using PICO_SDK_PATH from environment ('${PICO_SDK_PATH}')")
@@ -20,8 +18,8 @@ if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_P
     message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')")
 endif ()
 
-set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the PICO SDK")
-set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of PICO SDK from git if not otherwise locatable")
+set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK")
+set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of SDK from git if not otherwise locatable")
 set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK")
 
 if (NOT PICO_SDK_PATH)
@@ -37,14 +35,14 @@ if (NOT PICO_SDK_PATH)
                 GIT_TAG master
         )
         if (NOT pico_sdk)
-            message("Downloading PICO SDK")
+            message("Downloading Raspberry Pi Pico SDK")
             FetchContent_Populate(pico_sdk)
             set(PICO_SDK_PATH ${pico_sdk_SOURCE_DIR})
         endif ()
         set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})
     else ()
         message(FATAL_ERROR
-                "PICO SDK location was not specified. Please set PICO_SDK_PATH or set PICO_SDK_FETCH_FROM_GIT to on to fetch from git."
+                "SDK location was not specified. Please set PICO_SDK_PATH or set PICO_SDK_FETCH_FROM_GIT to on to fetch from git."
                 )
     endif ()
 endif ()
@@ -56,9 +54,9 @@ endif ()
 
 set(PICO_SDK_INIT_CMAKE_FILE ${PICO_SDK_PATH}/pico_sdk_init.cmake)
 if (NOT EXISTS ${PICO_SDK_INIT_CMAKE_FILE})
-    message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' does not appear to contain the PICO SDK")
+    message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' does not appear to contain the Raspberry Pi Pico SDK")
 endif ()
 
-set(PICO_SDK_PATH ${PICO_SDK_PATH} CACHE PATH "Path to the PICO SDK" FORCE)
+set(PICO_SDK_PATH ${PICO_SDK_PATH} CACHE PATH "Path to the Raspberry Pi Pico SDK" FORCE)
 
 include(${PICO_SDK_INIT_CMAKE_FILE})

tools/makeboards.py

@@ -90,7 +90,6 @@ def BuildHeader(name, vendor_name, product_name, vidtouse, pidtouse, vid, pid, p
     print("%s.build.f_cpu=125000000" % (name))
     print("%s.build.led=" % (name))
     print("%s.build.core=rp2040" % (name))
-    print("%s.build.mcu=rp2040" % (name))
     print("%s.build.ldscript=memmap_default.ld" % (name))
     print("%s.build.ram_length=%dk" % (name, ramsize / 1024))
     print("%s.build.boot2=%s" % (name, boot2))
@@ -99,6 +98,12 @@ def BuildHeader(name, vendor_name, product_name, vidtouse, pidtouse, vid, pid, p
     print('%s.build.usb_manufacturer="%s"' % (name, vendor_name))
     print('%s.build.usb_product="%s"' % (name, product_name))
 
+def WriteWarning():
+    print("# WARNING - DO NOT EDIT THIS FILE, IT IS MACHINE GENERATED")
+    print("#           To change something here, edit tools/makeboards.py and")
+    print("#           run 'python3 makeboards.py > ../boards.txt' to regenerate")
+    print()
+
 def BuildGlobalMenuList():
     print("menu.BoardModel=Model")
     print("menu.flash=Flash Size")
@@ -148,7 +153,7 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flash
         if name == "generic":
             BuildBoot(n)
 
-
+WriteWarning()
 BuildGlobalMenuList()
 MakeBoard("rpipico", "Raspberry Pi", "Pico", "0x2e8a", "0x000a", 250, "RASPBERRY_PI_PICO", 2, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_feather", "Adafruit", "Feather RP2040", "0x239a", "0x80f1", 250, "ADAFRUIT_FEATHER_RP2040", 8, "boot2_w25x10cl_4_padded_checksum")