Rename assembly dir to boot2, only has boot2.Ss (#230)

* update included tinyusb to 1.2.0

move tusb_config.h from core to library for more portability

* pump tinyusb

* update tinyusb to 1.3.0

* try to fix ci warning

boards.txt

@@ -112,9 +112,9 @@ rpipico.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_RP2040_SPI
 rpipico.menu.dbglvl.NDEBUG=NDEBUG
 rpipico.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 rpipico.menu.usbstack.picosdk=Pico SDK
-rpipico.menu.usbstack.picosdk.build.usbstack_flags=
+rpipico.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 rpipico.menu.usbstack.tinyusb=Adafruit TinyUSB
-rpipico.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+rpipico.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Raspberry Pi Pico (Picoprobe)
@@ -222,9 +222,9 @@ rpipicopicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_R
 rpipicopicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 rpipicopicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 rpipicopicoprobe.menu.usbstack.picosdk=Pico SDK
-rpipicopicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+rpipicopicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 rpipicopicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-rpipicopicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+rpipicopicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit Feather RP2040
@@ -368,9 +368,9 @@ adafruit_feather.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_R
 adafruit_feather.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_feather.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_feather.menu.usbstack.picosdk=Pico SDK
-adafruit_feather.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_feather.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_feather.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_feather.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_feather.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit Feather RP2040 (Picoprobe)
@@ -514,9 +514,9 @@ adafruit_featherpicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE
 adafruit_featherpicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_featherpicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_featherpicoprobe.menu.usbstack.picosdk=Pico SDK
-adafruit_featherpicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_featherpicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_featherpicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_featherpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_featherpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit ItsyBitsy RP2040
@@ -660,9 +660,9 @@ adafruit_itsybitsy.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG
 adafruit_itsybitsy.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_itsybitsy.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_itsybitsy.menu.usbstack.picosdk=Pico SDK
-adafruit_itsybitsy.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_itsybitsy.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_itsybitsy.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_itsybitsy.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_itsybitsy.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit ItsyBitsy RP2040 (Picoprobe)
@@ -806,9 +806,9 @@ adafruit_itsybitsypicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIR
 adafruit_itsybitsypicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_itsybitsypicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_itsybitsypicoprobe.menu.usbstack.picosdk=Pico SDK
-adafruit_itsybitsypicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_itsybitsypicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_itsybitsypicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_itsybitsypicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_itsybitsypicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit QT Py RP2040
@@ -952,9 +952,9 @@ adafruit_qtpy.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_RP20
 adafruit_qtpy.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_qtpy.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_qtpy.menu.usbstack.picosdk=Pico SDK
-adafruit_qtpy.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_qtpy.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_qtpy.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_qtpy.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_qtpy.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit QT Py RP2040 (Picoprobe)
@@ -1098,9 +1098,9 @@ adafruit_qtpypicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DD
 adafruit_qtpypicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_qtpypicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_qtpypicoprobe.menu.usbstack.picosdk=Pico SDK
-adafruit_qtpypicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_qtpypicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_qtpypicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_qtpypicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_qtpypicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit STEMMA Friend RP2040
@@ -1244,9 +1244,9 @@ adafruit_stemmafriend.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDE
 adafruit_stemmafriend.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_stemmafriend.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_stemmafriend.menu.usbstack.picosdk=Pico SDK
-adafruit_stemmafriend.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_stemmafriend.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_stemmafriend.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_stemmafriend.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_stemmafriend.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit STEMMA Friend RP2040 (Picoprobe)
@@ -1390,9 +1390,9 @@ adafruit_stemmafriendpicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_
 adafruit_stemmafriendpicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_stemmafriendpicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_stemmafriendpicoprobe.menu.usbstack.picosdk=Pico SDK
-adafruit_stemmafriendpicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_stemmafriendpicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_stemmafriendpicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_stemmafriendpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_stemmafriendpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit Trinkey RP2040 QT
@@ -1536,9 +1536,9 @@ adafruit_trinkeyrp2040qt.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -
 adafruit_trinkeyrp2040qt.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_trinkeyrp2040qt.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_trinkeyrp2040qt.menu.usbstack.picosdk=Pico SDK
-adafruit_trinkeyrp2040qt.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_trinkeyrp2040qt.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_trinkeyrp2040qt.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_trinkeyrp2040qt.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_trinkeyrp2040qt.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit Trinkey RP2040 QT (Picoprobe)
@@ -1682,9 +1682,9 @@ adafruit_trinkeyrp2040qtpicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP20
 adafruit_trinkeyrp2040qtpicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_trinkeyrp2040qtpicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_trinkeyrp2040qtpicoprobe.menu.usbstack.picosdk=Pico SDK
-adafruit_trinkeyrp2040qtpicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_trinkeyrp2040qtpicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_trinkeyrp2040qtpicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_trinkeyrp2040qtpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_trinkeyrp2040qtpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit MacroPad RP2040
@@ -1828,9 +1828,9 @@ adafruit_macropad2040.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDE
 adafruit_macropad2040.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_macropad2040.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_macropad2040.menu.usbstack.picosdk=Pico SDK
-adafruit_macropad2040.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_macropad2040.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_macropad2040.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_macropad2040.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_macropad2040.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Adafruit MacroPad RP2040 (Picoprobe)
@@ -1974,9 +1974,9 @@ adafruit_macropad2040picoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_
 adafruit_macropad2040picoprobe.menu.dbglvl.NDEBUG=NDEBUG
 adafruit_macropad2040picoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 adafruit_macropad2040picoprobe.menu.usbstack.picosdk=Pico SDK
-adafruit_macropad2040picoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_macropad2040picoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 adafruit_macropad2040picoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-adafruit_macropad2040picoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_macropad2040picoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Arduino Nano RP2040 Connect
@@ -2168,9 +2168,9 @@ arduino_nano_connect.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEB
 arduino_nano_connect.menu.dbglvl.NDEBUG=NDEBUG
 arduino_nano_connect.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 arduino_nano_connect.menu.usbstack.picosdk=Pico SDK
-arduino_nano_connect.menu.usbstack.picosdk.build.usbstack_flags=
+arduino_nano_connect.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 arduino_nano_connect.menu.usbstack.tinyusb=Adafruit TinyUSB
-arduino_nano_connect.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+arduino_nano_connect.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Arduino Nano RP2040 Connect (Picoprobe)
@@ -2362,9 +2362,9 @@ arduino_nano_connectpicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_W
 arduino_nano_connectpicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 arduino_nano_connectpicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 arduino_nano_connectpicoprobe.menu.usbstack.picosdk=Pico SDK
-arduino_nano_connectpicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+arduino_nano_connectpicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 arduino_nano_connectpicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-arduino_nano_connectpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+arduino_nano_connectpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # SparkFun ProMicro RP2040
@@ -2556,9 +2556,9 @@ sparkfun_promicrorp2040.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -D
 sparkfun_promicrorp2040.menu.dbglvl.NDEBUG=NDEBUG
 sparkfun_promicrorp2040.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 sparkfun_promicrorp2040.menu.usbstack.picosdk=Pico SDK
-sparkfun_promicrorp2040.menu.usbstack.picosdk.build.usbstack_flags=
+sparkfun_promicrorp2040.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 sparkfun_promicrorp2040.menu.usbstack.tinyusb=Adafruit TinyUSB
-sparkfun_promicrorp2040.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+sparkfun_promicrorp2040.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # SparkFun ProMicro RP2040 (Picoprobe)
@@ -2750,9 +2750,9 @@ sparkfun_promicrorp2040picoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP204
 sparkfun_promicrorp2040picoprobe.menu.dbglvl.NDEBUG=NDEBUG
 sparkfun_promicrorp2040picoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 sparkfun_promicrorp2040picoprobe.menu.usbstack.picosdk=Pico SDK
-sparkfun_promicrorp2040picoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+sparkfun_promicrorp2040picoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 sparkfun_promicrorp2040picoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-sparkfun_promicrorp2040picoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+sparkfun_promicrorp2040picoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # -----------------------------------
 # Generic RP2040
@@ -2872,9 +2872,9 @@ generic.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_RP2040_SPI
 generic.menu.dbglvl.NDEBUG=NDEBUG
 generic.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 generic.menu.usbstack.picosdk=Pico SDK
-generic.menu.usbstack.picosdk.build.usbstack_flags=
+generic.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 generic.menu.usbstack.tinyusb=Adafruit TinyUSB
-generic.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+generic.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 generic.menu.boot2.boot2_generic_03h_2_padded_checksum=Generic SPI /2
 generic.menu.boot2.boot2_generic_03h_2_padded_checksum.build.boot2=boot2_generic_03h_2_padded_checksum
 generic.menu.boot2.boot2_generic_03h_4_padded_checksum=Generic SPI /4
@@ -3010,9 +3010,9 @@ genericpicoprobe.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_R
 genericpicoprobe.menu.dbglvl.NDEBUG=NDEBUG
 genericpicoprobe.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
 genericpicoprobe.menu.usbstack.picosdk=Pico SDK
-genericpicoprobe.menu.usbstack.picosdk.build.usbstack_flags=
+genericpicoprobe.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"
 genericpicoprobe.menu.usbstack.tinyusb=Adafruit TinyUSB
-genericpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+genericpicoprobe.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 genericpicoprobe.menu.boot2.boot2_generic_03h_2_padded_checksum=Generic SPI /2
 genericpicoprobe.menu.boot2.boot2_generic_03h_2_padded_checksum.build.boot2=boot2_generic_03h_2_padded_checksum
 genericpicoprobe.menu.boot2.boot2_generic_03h_4_padded_checksum=Generic SPI /4

cores/rp2040/TinyUSB/tusb_config.h

@@ -1,90 +0,0 @@
-/*
-    The MIT License (MIT)
-
-    Copyright (c) 2018, hathach for Adafruit
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-*/
-
-#ifndef _TUSB_CONFIG_H_
-#define _TUSB_CONFIG_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//--------------------------------------------------------------------
-// COMMON CONFIGURATION
-//--------------------------------------------------------------------
-#ifdef USE_TINYUSB
-#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
-#else
-#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_NONE
-#endif
-
-//#ifndef CFG_TUSB_MCU
-// #define CFG_TUSB_MCU                OPT_MCU_RP2040
-//#endif
-#define CFG_TUSB_OS                 OPT_OS_PICO
-
-#define CFG_TUSB_DEBUG              0
-//#if CFG_TUSB_DEBUG
-//  #define tu_printf                 serial1_printf
-//  extern int serial1_printf(const char *__restrict __format, ...);
-//#endif
-
-#define CFG_TUSB_MEM_SECTION
-#define CFG_TUSB_MEM_ALIGN          TU_ATTR_ALIGNED(4)
-
-//--------------------------------------------------------------------
-// DEVICE CONFIGURATION
-//--------------------------------------------------------------------
-
-#define CFG_TUD_ENDOINT0_SIZE       64
-
-//------------- CLASS -------------//
-#define CFG_TUD_CDC                 1
-#define CFG_TUD_MSC                 1
-#define CFG_TUD_HID                 1
-#define CFG_TUD_MIDI                1
-#define CFG_TUD_VENDOR              1
-
-// CDC FIFO size of TX and RX
-#define CFG_TUD_CDC_RX_BUFSIZE      256
-#define CFG_TUD_CDC_TX_BUFSIZE      256
-
-// MSC Buffer size of Device Mass storage
-#define CFG_TUD_MSC_BUFSIZE         512
-
-// HID buffer size Should be sufficient to hold ID (if any) + Data
-#define CFG_TUD_HID_BUFSIZE         64
-
-// MIDI FIFO size of TX and RX
-#define CFG_TUD_MIDI_RX_BUFSIZE     128
-#define CFG_TUD_MIDI_TX_BUFSIZE     128
-
-// Vendor FIFO size of TX and RX
-#define CFG_TUD_VENDOR_RX_BUFSIZE   64
-#define CFG_TUD_VENDOR_TX_BUFSIZE   64
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _TUSB_CONFIG_H_ */

lib/platform_inc.txt

@@ -1,13 +1,11 @@
 -iwithprefixbefore/cores/rp2040/api/deprecated-avr-comp/
 -iwithprefixbefore/lib/pico_base/
--iwithprefixbefore/pico-examples/build/generated/pico_base
 -iwithprefixbefore/pico-extras/src/common/pico_audio/include
 -iwithprefixbefore/pico-extras/src/common/pico_util_buffer/include
 -iwithprefixbefore/pico-extras/src/rp2_common/pico_audio_i2s/include
 -iwithprefixbefore/pico-sdk/lib/tinyusb/src/
 -iwithprefixbefore/pico-sdk/src/boards/include
 -iwithprefixbefore/pico-sdk/src/common/pico_base/include
--iwithprefixbefore/pico-sdk/src/common/pico_base/include/
 -iwithprefixbefore/pico-sdk/src/common/pico_binary_info/include
 -iwithprefixbefore/pico-sdk/src/common/pico_bit_ops/include
 -iwithprefixbefore/pico-sdk/src/common/pico_divider/include
@@ -16,8 +14,6 @@
 -iwithprefixbefore/pico-sdk/src/common/pico_time/include
 -iwithprefixbefore/pico-sdk/src/common/pico_util/include
 -iwithprefixbefore/pico-sdk/src/rp2040/hardware_regs/include
--iwithprefixbefore/pico-sdk/src/rp2040/hardware_regs/include/
--iwithprefixbefore/pico-sdk/src/rp2040/hardware_regs/include/
 -iwithprefixbefore/pico-sdk/src/rp2040/hardware_structs/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_adc/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_base/include
@@ -37,7 +33,6 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_spi/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_sync/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_timer/include
--iwithprefixbefore/pico-sdk/src/rp2_common/hardware_timer/include/
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_uart/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_vreg/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_watchdog/include
@@ -47,12 +42,9 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_float/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_int64_ops/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_multicore/include
--iwithprefixbefore/pico-sdk/src/rp2_common/pico_multicore/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform/include
--iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform/include/
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_printf/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_runtime/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_stdio/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_stdio_uart/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_unique_id/include
--iwithprefixbefore/tools/libpico

platform.txt

@@ -110,7 +110,7 @@ recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compil
 recipe.hooks.linking.prelink.1.pattern="{runtime.tools.pqt-python3.path}/python3" "{runtime.platform.path}/tools/simplesub.py" --input "{runtime.platform.path}/lib/memmap_default.ld" --out "{build.path}/memmap_default.ld" --sub __FLASH_LENGTH__ {build.flash_length} --sub __EEPROM_START__ {build.eeprom_start} --sub __FS_START__ {build.fs_start} --sub __FS_END__ {build.fs_end}
 
 ## Compile the boot stage 2 blob
-recipe.hooks.linking.prelink.2.pattern="{compiler.path}{compiler.S.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -c "{runtime.platform.path}/assembly/{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"
+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 -lstdc++ -lc -Wl,--end-group

tools/libpico/make-libpico.sh

@@ -42,4 +42,4 @@ for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
                    -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
     done
 done
-mv *.S ../../../../assembly/.
+mv *.S ../../../../boot2/.

tools/makeboards.py

@@ -46,9 +46,9 @@ def BuildBoot(name):
 
 def BuildUSBStack(name):
     print("%s.menu.usbstack.picosdk=Pico SDK" % (name))
-    print("%s.menu.usbstack.picosdk.build.usbstack_flags=" % (name))
+    print('%s.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"' % (name))
     print("%s.menu.usbstack.tinyusb=Adafruit TinyUSB" % (name))
-    print('%s.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"' % (name))
+    print('%s.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"' % (name))
 
 def BuildHeader(name, vendor_name, product_name, pidtouse, vid, pid, boarddefine, variant, uploadtool, flashsize, boot2):
     prettyname = vendor_name + " " + product_name