Fix PID specification for arduino-cli (#2157)

boards.txt

@@ -37,6 +37,22 @@ rpipico.vid.6=0x2e8a
 rpipico.pid.6=0xc00a
 rpipico.vid.7=0x2e8a
 rpipico.pid.7=0xc10a
+rpipico.upload_port.0.vid=0x2e8a
+rpipico.upload_port.0.pid=0x000a
+rpipico.upload_port.1.vid=0x2e8a
+rpipico.upload_port.1.pid=0x010a
+rpipico.upload_port.2.vid=0x2e8a
+rpipico.upload_port.2.pid=0x400a
+rpipico.upload_port.3.vid=0x2e8a
+rpipico.upload_port.3.pid=0x410a
+rpipico.upload_port.4.vid=0x2e8a
+rpipico.upload_port.4.pid=0x800a
+rpipico.upload_port.5.vid=0x2e8a
+rpipico.upload_port.5.pid=0x810a
+rpipico.upload_port.6.vid=0x2e8a
+rpipico.upload_port.6.pid=0xc00a
+rpipico.upload_port.7.vid=0x2e8a
+rpipico.upload_port.7.pid=0xc10a
 rpipico.build.usbvid=-DUSBD_VID=0x2e8a
 rpipico.build.usbpid=-DUSBD_PID=0x000a
 rpipico.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -229,18 +245,10 @@ rpipicow.vid.0=0x2e8a
 rpipicow.pid.0=0xf00a
 rpipicow.vid.1=0x2e8a
 rpipicow.pid.1=0xf10a
-rpipicow.vid.2=0x2e8a
-rpipicow.pid.2=0xf00a
-rpipicow.vid.3=0x2e8a
-rpipicow.pid.3=0xf10a
-rpipicow.vid.4=0x2e8a
-rpipicow.pid.4=0xf00a
-rpipicow.vid.5=0x2e8a
-rpipicow.pid.5=0xf10a
-rpipicow.vid.6=0x2e8a
-rpipicow.pid.6=0xf00a
-rpipicow.vid.7=0x2e8a
-rpipicow.pid.7=0xf10a
+rpipicow.upload_port.0.vid=0x2e8a
+rpipicow.upload_port.0.pid=0xf00a
+rpipicow.upload_port.1.vid=0x2e8a
+rpipicow.upload_port.1.pid=0xf10a
 rpipicow.build.usbvid=-DUSBD_VID=0x2e8a
 rpipicow.build.usbpid=-DUSBD_PID=0xf00a
 rpipicow.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -535,22 +543,10 @@ rpipicow.menu.uploadmethod.picodebug.upload.tool.default=picodebug
 0xcb_helios.name=0xCB Helios
 0xcb_helios.vid.0=0x1209
 0xcb_helios.pid.0=0xcb74
-0xcb_helios.vid.1=0x1209
-0xcb_helios.pid.1=0xcb74
-0xcb_helios.vid.2=0x1209
-0xcb_helios.pid.2=0xcb74
-0xcb_helios.vid.3=0x1209
-0xcb_helios.pid.3=0xcb74
-0xcb_helios.vid.4=0x1209
-0xcb_helios.pid.4=0xcb74
-0xcb_helios.vid.5=0x1209
-0xcb_helios.pid.5=0xcb74
-0xcb_helios.vid.6=0x1209
-0xcb_helios.pid.6=0xcb74
-0xcb_helios.vid.7=0x1209
-0xcb_helios.pid.7=0xcb74
+0xcb_helios.upload_port.0.vid=0x1209
+0xcb_helios.upload_port.0.pid=0xcb74
 0xcb_helios.build.usbvid=-DUSBD_VID=0x1209
-0xcb_helios.build.usbpid=-DUSBD_PID=0xCB74
+0xcb_helios.build.usbpid=-DUSBD_PID=0xcb74
 0xcb_helios.build.usbpwr=-DUSBD_MAX_POWER_MA=500
 0xcb_helios.build.board=0XCB_HELIOS
 0xcb_helios.build.mcu=cortex-m0plus
@@ -843,14 +839,14 @@ adafruit_feather.vid.2=0x239a
 adafruit_feather.pid.2=0xc0f1
 adafruit_feather.vid.3=0x239a
 adafruit_feather.pid.3=0xc1f1
-adafruit_feather.vid.4=0x239a
-adafruit_feather.pid.4=0x80f1
-adafruit_feather.vid.5=0x239a
-adafruit_feather.pid.5=0x81f1
-adafruit_feather.vid.6=0x239a
-adafruit_feather.pid.6=0xc0f1
-adafruit_feather.vid.7=0x239a
-adafruit_feather.pid.7=0xc1f1
+adafruit_feather.upload_port.0.vid=0x239a
+adafruit_feather.upload_port.0.pid=0x80f1
+adafruit_feather.upload_port.1.vid=0x239a
+adafruit_feather.upload_port.1.pid=0x81f1
+adafruit_feather.upload_port.2.vid=0x239a
+adafruit_feather.upload_port.2.pid=0xc0f1
+adafruit_feather.upload_port.3.vid=0x239a
+adafruit_feather.upload_port.3.pid=0xc1f1
 adafruit_feather.build.usbvid=-DUSBD_VID=0x239a
 adafruit_feather.build.usbpid=-DUSBD_PID=0x80f1
 adafruit_feather.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -1084,19 +1080,11 @@ adafruit_feather_scorpio.name=Adafruit Feather RP2040 SCORPIO
 adafruit_feather_scorpio.vid.0=0x239a
 adafruit_feather_scorpio.pid.0=0x8121
 adafruit_feather_scorpio.vid.1=0x239a
-adafruit_feather_scorpio.pid.1=0x8121
-adafruit_feather_scorpio.vid.2=0x239a
-adafruit_feather_scorpio.pid.2=0xc121
-adafruit_feather_scorpio.vid.3=0x239a
-adafruit_feather_scorpio.pid.3=0xc121
-adafruit_feather_scorpio.vid.4=0x239a
-adafruit_feather_scorpio.pid.4=0x8121
-adafruit_feather_scorpio.vid.5=0x239a
-adafruit_feather_scorpio.pid.5=0x8121
-adafruit_feather_scorpio.vid.6=0x239a
-adafruit_feather_scorpio.pid.6=0xc121
-adafruit_feather_scorpio.vid.7=0x239a
-adafruit_feather_scorpio.pid.7=0xc121
+adafruit_feather_scorpio.pid.1=0xc121
+adafruit_feather_scorpio.upload_port.0.vid=0x239a
+adafruit_feather_scorpio.upload_port.0.pid=0x8121
+adafruit_feather_scorpio.upload_port.1.vid=0x239a
+adafruit_feather_scorpio.upload_port.1.pid=0xc121
 adafruit_feather_scorpio.build.usbvid=-DUSBD_VID=0x239a
 adafruit_feather_scorpio.build.usbpid=-DUSBD_PID=0x8121
 adafruit_feather_scorpio.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -1334,19 +1322,11 @@ adafruit_feather_dvi.name=Adafruit Feather RP2040 DVI
 adafruit_feather_dvi.vid.0=0x239a
 adafruit_feather_dvi.pid.0=0x8127
 adafruit_feather_dvi.vid.1=0x239a
-adafruit_feather_dvi.pid.1=0x8127
-adafruit_feather_dvi.vid.2=0x239a
-adafruit_feather_dvi.pid.2=0xc127
-adafruit_feather_dvi.vid.3=0x239a
-adafruit_feather_dvi.pid.3=0xc127
-adafruit_feather_dvi.vid.4=0x239a
-adafruit_feather_dvi.pid.4=0x8127
-adafruit_feather_dvi.vid.5=0x239a
-adafruit_feather_dvi.pid.5=0x8127
-adafruit_feather_dvi.vid.6=0x239a
-adafruit_feather_dvi.pid.6=0xc127
-adafruit_feather_dvi.vid.7=0x239a
-adafruit_feather_dvi.pid.7=0xc127
+adafruit_feather_dvi.pid.1=0xc127
+adafruit_feather_dvi.upload_port.0.vid=0x239a
+adafruit_feather_dvi.upload_port.0.pid=0x8127
+adafruit_feather_dvi.upload_port.1.vid=0x239a
+adafruit_feather_dvi.upload_port.1.pid=0xc127
 adafruit_feather_dvi.build.usbvid=-DUSBD_VID=0x239a
 adafruit_feather_dvi.build.usbpid=-DUSBD_PID=0x8127
 adafruit_feather_dvi.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -1584,21 +1564,13 @@ adafruit_feather_rfm.name=Adafruit Feather RP2040 RFM
 adafruit_feather_rfm.vid.0=0x239a
 adafruit_feather_rfm.pid.0=0x812d
 adafruit_feather_rfm.vid.1=0x239a
-adafruit_feather_rfm.pid.1=0x812d
-adafruit_feather_rfm.vid.2=0x239a
-adafruit_feather_rfm.pid.2=0xc12d
-adafruit_feather_rfm.vid.3=0x239a
-adafruit_feather_rfm.pid.3=0xc12d
-adafruit_feather_rfm.vid.4=0x239a
-adafruit_feather_rfm.pid.4=0x812d
-adafruit_feather_rfm.vid.5=0x239a
-adafruit_feather_rfm.pid.5=0x812d
-adafruit_feather_rfm.vid.6=0x239a
-adafruit_feather_rfm.pid.6=0xc12d
-adafruit_feather_rfm.vid.7=0x239a
-adafruit_feather_rfm.pid.7=0xc12d
+adafruit_feather_rfm.pid.1=0xc12d
+adafruit_feather_rfm.upload_port.0.vid=0x239a
+adafruit_feather_rfm.upload_port.0.pid=0x812d
+adafruit_feather_rfm.upload_port.1.vid=0x239a
+adafruit_feather_rfm.upload_port.1.pid=0xc12d
 adafruit_feather_rfm.build.usbvid=-DUSBD_VID=0x239a
-adafruit_feather_rfm.build.usbpid=-DUSBD_PID=0x812D
+adafruit_feather_rfm.build.usbpid=-DUSBD_PID=0x812d
 adafruit_feather_rfm.build.usbpwr=-DUSBD_MAX_POWER_MA=250
 adafruit_feather_rfm.build.board=ADAFRUIT_FEATHER_RP2040_RFM
 adafruit_feather_rfm.build.mcu=cortex-m0plus
@@ -1834,21 +1806,13 @@ adafruit_feather_thinkink.name=Adafruit Feather RP2040 ThinkINK
 adafruit_feather_thinkink.vid.0=0x239a
 adafruit_feather_thinkink.pid.0=0x812b
 adafruit_feather_thinkink.vid.1=0x239a
-adafruit_feather_thinkink.pid.1=0x812b
-adafruit_feather_thinkink.vid.2=0x239a
-adafruit_feather_thinkink.pid.2=0xc12b
-adafruit_feather_thinkink.vid.3=0x239a
-adafruit_feather_thinkink.pid.3=0xc12b
-adafruit_feather_thinkink.vid.4=0x239a
-adafruit_feather_thinkink.pid.4=0x812b
-adafruit_feather_thinkink.vid.5=0x239a
-adafruit_feather_thinkink.pid.5=0x812b
-adafruit_feather_thinkink.vid.6=0x239a
-adafruit_feather_thinkink.pid.6=0xc12b
-adafruit_feather_thinkink.vid.7=0x239a
-adafruit_feather_thinkink.pid.7=0xc12b
+adafruit_feather_thinkink.pid.1=0xc12b
+adafruit_feather_thinkink.upload_port.0.vid=0x239a
+adafruit_feather_thinkink.upload_port.0.pid=0x812b
+adafruit_feather_thinkink.upload_port.1.vid=0x239a
+adafruit_feather_thinkink.upload_port.1.pid=0xc12b
 adafruit_feather_thinkink.build.usbvid=-DUSBD_VID=0x239a
-adafruit_feather_thinkink.build.usbpid=-DUSBD_PID=0x812B
+adafruit_feather_thinkink.build.usbpid=-DUSBD_PID=0x812b
 adafruit_feather_thinkink.build.usbpwr=-DUSBD_MAX_POWER_MA=250
 adafruit_feather_thinkink.build.board=ADAFRUIT_FEATHER_RP2040_THINKINK
 adafruit_feather_thinkink.build.mcu=cortex-m0plus
@@ -2084,19 +2048,11 @@ adafruit_feather_usb_host.name=Adafruit Feather RP2040 USB Host
 adafruit_feather_usb_host.vid.0=0x239a
 adafruit_feather_usb_host.pid.0=0x8129
 adafruit_feather_usb_host.vid.1=0x239a
-adafruit_feather_usb_host.pid.1=0x8129
-adafruit_feather_usb_host.vid.2=0x239a
-adafruit_feather_usb_host.pid.2=0xc129
-adafruit_feather_usb_host.vid.3=0x239a
-adafruit_feather_usb_host.pid.3=0xc129
-adafruit_feather_usb_host.vid.4=0x239a
-adafruit_feather_usb_host.pid.4=0x8129
-adafruit_feather_usb_host.vid.5=0x239a
-adafruit_feather_usb_host.pid.5=0x8129
-adafruit_feather_usb_host.vid.6=0x239a
-adafruit_feather_usb_host.pid.6=0xc129
-adafruit_feather_usb_host.vid.7=0x239a
-adafruit_feather_usb_host.pid.7=0xc129
+adafruit_feather_usb_host.pid.1=0xc129
+adafruit_feather_usb_host.upload_port.0.vid=0x239a
+adafruit_feather_usb_host.upload_port.0.pid=0x8129
+adafruit_feather_usb_host.upload_port.1.vid=0x239a
+adafruit_feather_usb_host.upload_port.1.pid=0xc129
 adafruit_feather_usb_host.build.usbvid=-DUSBD_VID=0x239a
 adafruit_feather_usb_host.build.usbpid=-DUSBD_PID=0x8129
 adafruit_feather_usb_host.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -2334,19 +2290,11 @@ adafruit_feather_can.name=Adafruit Feather RP2040 CAN
 adafruit_feather_can.vid.0=0x239a
 adafruit_feather_can.pid.0=0x812f
 adafruit_feather_can.vid.1=0x239a
-adafruit_feather_can.pid.1=0x812f
-adafruit_feather_can.vid.2=0x239a
-adafruit_feather_can.pid.2=0xc12f
-adafruit_feather_can.vid.3=0x239a
-adafruit_feather_can.pid.3=0xc12f
-adafruit_feather_can.vid.4=0x239a
-adafruit_feather_can.pid.4=0x812f
-adafruit_feather_can.vid.5=0x239a
-adafruit_feather_can.pid.5=0x812f
-adafruit_feather_can.vid.6=0x239a
-adafruit_feather_can.pid.6=0xc12f
-adafruit_feather_can.vid.7=0x239a
-adafruit_feather_can.pid.7=0xc12f
+adafruit_feather_can.pid.1=0xc12f
+adafruit_feather_can.upload_port.0.vid=0x239a
+adafruit_feather_can.upload_port.0.pid=0x812f
+adafruit_feather_can.upload_port.1.vid=0x239a
+adafruit_feather_can.upload_port.1.pid=0xc12f
 adafruit_feather_can.build.usbvid=-DUSBD_VID=0x239a
 adafruit_feather_can.build.usbpid=-DUSBD_PID=0x812f
 adafruit_feather_can.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -2584,19 +2532,11 @@ adafruit_feather_prop_maker.name=Adafruit Feather RP2040 Prop-Maker
 adafruit_feather_prop_maker.vid.0=0x239a
 adafruit_feather_prop_maker.pid.0=0x8131
 adafruit_feather_prop_maker.vid.1=0x239a
-adafruit_feather_prop_maker.pid.1=0x8131
-adafruit_feather_prop_maker.vid.2=0x239a
-adafruit_feather_prop_maker.pid.2=0xc131
-adafruit_feather_prop_maker.vid.3=0x239a
-adafruit_feather_prop_maker.pid.3=0xc131
-adafruit_feather_prop_maker.vid.4=0x239a
-adafruit_feather_prop_maker.pid.4=0x8131
-adafruit_feather_prop_maker.vid.5=0x239a
-adafruit_feather_prop_maker.pid.5=0x8131
-adafruit_feather_prop_maker.vid.6=0x239a
-adafruit_feather_prop_maker.pid.6=0xc131
-adafruit_feather_prop_maker.vid.7=0x239a
-adafruit_feather_prop_maker.pid.7=0xc131
+adafruit_feather_prop_maker.pid.1=0xc131
+adafruit_feather_prop_maker.upload_port.0.vid=0x239a
+adafruit_feather_prop_maker.upload_port.0.pid=0x8131
+adafruit_feather_prop_maker.upload_port.1.vid=0x239a
+adafruit_feather_prop_maker.upload_port.1.pid=0xc131
 adafruit_feather_prop_maker.build.usbvid=-DUSBD_VID=0x239a
 adafruit_feather_prop_maker.build.usbpid=-DUSBD_PID=0x8131
 adafruit_feather_prop_maker.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -2839,14 +2779,14 @@ adafruit_itsybitsy.vid.2=0x239a
 adafruit_itsybitsy.pid.2=0xc0fd
 adafruit_itsybitsy.vid.3=0x239a
 adafruit_itsybitsy.pid.3=0xc1fd
-adafruit_itsybitsy.vid.4=0x239a
-adafruit_itsybitsy.pid.4=0x80fd
-adafruit_itsybitsy.vid.5=0x239a
-adafruit_itsybitsy.pid.5=0x81fd
-adafruit_itsybitsy.vid.6=0x239a
-adafruit_itsybitsy.pid.6=0xc0fd
-adafruit_itsybitsy.vid.7=0x239a
-adafruit_itsybitsy.pid.7=0xc1fd
+adafruit_itsybitsy.upload_port.0.vid=0x239a
+adafruit_itsybitsy.upload_port.0.pid=0x80fd
+adafruit_itsybitsy.upload_port.1.vid=0x239a
+adafruit_itsybitsy.upload_port.1.pid=0x81fd
+adafruit_itsybitsy.upload_port.2.vid=0x239a
+adafruit_itsybitsy.upload_port.2.pid=0xc0fd
+adafruit_itsybitsy.upload_port.3.vid=0x239a
+adafruit_itsybitsy.upload_port.3.pid=0xc1fd
 adafruit_itsybitsy.build.usbvid=-DUSBD_VID=0x239a
 adafruit_itsybitsy.build.usbpid=-DUSBD_PID=0x80fd
 adafruit_itsybitsy.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -3084,19 +3024,11 @@ adafruit_metro.name=Adafruit Metro RP2040
 adafruit_metro.vid.0=0x239a
 adafruit_metro.pid.0=0x813d
 adafruit_metro.vid.1=0x239a
-adafruit_metro.pid.1=0x813d
-adafruit_metro.vid.2=0x239a
-adafruit_metro.pid.2=0xc13d
-adafruit_metro.vid.3=0x239a
-adafruit_metro.pid.3=0xc13d
-adafruit_metro.vid.4=0x239a
-adafruit_metro.pid.4=0x813d
-adafruit_metro.vid.5=0x239a
-adafruit_metro.pid.5=0x813d
-adafruit_metro.vid.6=0x239a
-adafruit_metro.pid.6=0xc13d
-adafruit_metro.vid.7=0x239a
-adafruit_metro.pid.7=0xc13d
+adafruit_metro.pid.1=0xc13d
+adafruit_metro.upload_port.0.vid=0x239a
+adafruit_metro.upload_port.0.pid=0x813d
+adafruit_metro.upload_port.1.vid=0x239a
+adafruit_metro.upload_port.1.pid=0xc13d
 adafruit_metro.build.usbvid=-DUSBD_VID=0x239a
 adafruit_metro.build.usbpid=-DUSBD_PID=0x813d
 adafruit_metro.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -3395,14 +3327,14 @@ adafruit_qtpy.vid.2=0x239a
 adafruit_qtpy.pid.2=0xc0f7
 adafruit_qtpy.vid.3=0x239a
 adafruit_qtpy.pid.3=0xc1f7
-adafruit_qtpy.vid.4=0x239a
-adafruit_qtpy.pid.4=0x80f7
-adafruit_qtpy.vid.5=0x239a
-adafruit_qtpy.pid.5=0x81f7
-adafruit_qtpy.vid.6=0x239a
-adafruit_qtpy.pid.6=0xc0f7
-adafruit_qtpy.vid.7=0x239a
-adafruit_qtpy.pid.7=0xc1f7
+adafruit_qtpy.upload_port.0.vid=0x239a
+adafruit_qtpy.upload_port.0.pid=0x80f7
+adafruit_qtpy.upload_port.1.vid=0x239a
+adafruit_qtpy.upload_port.1.pid=0x81f7
+adafruit_qtpy.upload_port.2.vid=0x239a
+adafruit_qtpy.upload_port.2.pid=0xc0f7
+adafruit_qtpy.upload_port.3.vid=0x239a
+adafruit_qtpy.upload_port.3.pid=0xc1f7
 adafruit_qtpy.build.usbvid=-DUSBD_VID=0x239a
 adafruit_qtpy.build.usbpid=-DUSBD_PID=0x80f7
 adafruit_qtpy.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -3645,14 +3577,14 @@ adafruit_stemmafriend.vid.2=0x239a
 adafruit_stemmafriend.pid.2=0xc0e3
 adafruit_stemmafriend.vid.3=0x239a
 adafruit_stemmafriend.pid.3=0xc1e3
-adafruit_stemmafriend.vid.4=0x239a
-adafruit_stemmafriend.pid.4=0x80e3
-adafruit_stemmafriend.vid.5=0x239a
-adafruit_stemmafriend.pid.5=0x81e3
-adafruit_stemmafriend.vid.6=0x239a
-adafruit_stemmafriend.pid.6=0xc0e3
-adafruit_stemmafriend.vid.7=0x239a
-adafruit_stemmafriend.pid.7=0xc1e3
+adafruit_stemmafriend.upload_port.0.vid=0x239a
+adafruit_stemmafriend.upload_port.0.pid=0x80e3
+adafruit_stemmafriend.upload_port.1.vid=0x239a
+adafruit_stemmafriend.upload_port.1.pid=0x81e3
+adafruit_stemmafriend.upload_port.2.vid=0x239a
+adafruit_stemmafriend.upload_port.2.pid=0xc0e3
+adafruit_stemmafriend.upload_port.3.vid=0x239a
+adafruit_stemmafriend.upload_port.3.pid=0xc1e3
 adafruit_stemmafriend.build.usbvid=-DUSBD_VID=0x239a
 adafruit_stemmafriend.build.usbpid=-DUSBD_PID=0x80e3
 adafruit_stemmafriend.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -3890,19 +3822,11 @@ adafruit_trinkeyrp2040qt.name=Adafruit Trinkey RP2040 QT
 adafruit_trinkeyrp2040qt.vid.0=0x239a
 adafruit_trinkeyrp2040qt.pid.0=0x8109
 adafruit_trinkeyrp2040qt.vid.1=0x239a
-adafruit_trinkeyrp2040qt.pid.1=0x8109
-adafruit_trinkeyrp2040qt.vid.2=0x239a
-adafruit_trinkeyrp2040qt.pid.2=0xc109
-adafruit_trinkeyrp2040qt.vid.3=0x239a
-adafruit_trinkeyrp2040qt.pid.3=0xc109
-adafruit_trinkeyrp2040qt.vid.4=0x239a
-adafruit_trinkeyrp2040qt.pid.4=0x8109
-adafruit_trinkeyrp2040qt.vid.5=0x239a
-adafruit_trinkeyrp2040qt.pid.5=0x8109
-adafruit_trinkeyrp2040qt.vid.6=0x239a
-adafruit_trinkeyrp2040qt.pid.6=0xc109
-adafruit_trinkeyrp2040qt.vid.7=0x239a
-adafruit_trinkeyrp2040qt.pid.7=0xc109
+adafruit_trinkeyrp2040qt.pid.1=0xc109
+adafruit_trinkeyrp2040qt.upload_port.0.vid=0x239a
+adafruit_trinkeyrp2040qt.upload_port.0.pid=0x8109
+adafruit_trinkeyrp2040qt.upload_port.1.vid=0x239a
+adafruit_trinkeyrp2040qt.upload_port.1.pid=0xc109
 adafruit_trinkeyrp2040qt.build.usbvid=-DUSBD_VID=0x239a
 adafruit_trinkeyrp2040qt.build.usbpid=-DUSBD_PID=0x8109
 adafruit_trinkeyrp2040qt.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -4140,19 +4064,11 @@ adafruit_macropad2040.name=Adafruit MacroPad RP2040
 adafruit_macropad2040.vid.0=0x239a
 adafruit_macropad2040.pid.0=0x8107
 adafruit_macropad2040.vid.1=0x239a
-adafruit_macropad2040.pid.1=0x8107
-adafruit_macropad2040.vid.2=0x239a
-adafruit_macropad2040.pid.2=0xc107
-adafruit_macropad2040.vid.3=0x239a
-adafruit_macropad2040.pid.3=0xc107
-adafruit_macropad2040.vid.4=0x239a
-adafruit_macropad2040.pid.4=0x8107
-adafruit_macropad2040.vid.5=0x239a
-adafruit_macropad2040.pid.5=0x8107
-adafruit_macropad2040.vid.6=0x239a
-adafruit_macropad2040.pid.6=0xc107
-adafruit_macropad2040.vid.7=0x239a
-adafruit_macropad2040.pid.7=0xc107
+adafruit_macropad2040.pid.1=0xc107
+adafruit_macropad2040.upload_port.0.vid=0x239a
+adafruit_macropad2040.upload_port.0.pid=0x8107
+adafruit_macropad2040.upload_port.1.vid=0x239a
+adafruit_macropad2040.upload_port.1.pid=0xc107
 adafruit_macropad2040.build.usbvid=-DUSBD_VID=0x239a
 adafruit_macropad2040.build.usbpid=-DUSBD_PID=0x8107
 adafruit_macropad2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -4390,19 +4306,11 @@ adafruit_kb2040.name=Adafruit KB2040
 adafruit_kb2040.vid.0=0x239a
 adafruit_kb2040.pid.0=0x8105
 adafruit_kb2040.vid.1=0x239a
-adafruit_kb2040.pid.1=0x8105
-adafruit_kb2040.vid.2=0x239a
-adafruit_kb2040.pid.2=0xc105
-adafruit_kb2040.vid.3=0x239a
-adafruit_kb2040.pid.3=0xc105
-adafruit_kb2040.vid.4=0x239a
-adafruit_kb2040.pid.4=0x8105
-adafruit_kb2040.vid.5=0x239a
-adafruit_kb2040.pid.5=0x8105
-adafruit_kb2040.vid.6=0x239a
-adafruit_kb2040.pid.6=0xc105
-adafruit_kb2040.vid.7=0x239a
-adafruit_kb2040.pid.7=0xc105
+adafruit_kb2040.pid.1=0xc105
+adafruit_kb2040.upload_port.0.vid=0x239a
+adafruit_kb2040.upload_port.0.pid=0x8105
+adafruit_kb2040.upload_port.1.vid=0x239a
+adafruit_kb2040.upload_port.1.pid=0xc105
 adafruit_kb2040.build.usbvid=-DUSBD_VID=0x239a
 adafruit_kb2040.build.usbpid=-DUSBD_PID=0x8105
 adafruit_kb2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -4645,6 +4553,14 @@ arduino_nano_connect.vid.2=0x2341
 arduino_nano_connect.pid.2=0x015e
 arduino_nano_connect.vid.3=0x2341
 arduino_nano_connect.pid.3=0x025e
+arduino_nano_connect.upload_port.0.vid=0x2341
+arduino_nano_connect.upload_port.0.pid=0x005e
+arduino_nano_connect.upload_port.1.vid=0x2341
+arduino_nano_connect.upload_port.1.pid=0x805e
+arduino_nano_connect.upload_port.2.vid=0x2341
+arduino_nano_connect.upload_port.2.pid=0x015e
+arduino_nano_connect.upload_port.3.vid=0x2341
+arduino_nano_connect.upload_port.3.pid=0x025e
 arduino_nano_connect.build.usbvid=-DUSBD_VID=0x2341
 arduino_nano_connect.build.usbpid=-DUSBD_PID=0x005e
 arduino_nano_connect.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -4947,6 +4863,22 @@ artronshop_rp2_nano.vid.6=0x2e8a
 artronshop_rp2_nano.pid.6=0xc00a
 artronshop_rp2_nano.vid.7=0x2e8a
 artronshop_rp2_nano.pid.7=0xc10a
+artronshop_rp2_nano.upload_port.0.vid=0x2e8a
+artronshop_rp2_nano.upload_port.0.pid=0x000a
+artronshop_rp2_nano.upload_port.1.vid=0x2e8a
+artronshop_rp2_nano.upload_port.1.pid=0x010a
+artronshop_rp2_nano.upload_port.2.vid=0x2e8a
+artronshop_rp2_nano.upload_port.2.pid=0x400a
+artronshop_rp2_nano.upload_port.3.vid=0x2e8a
+artronshop_rp2_nano.upload_port.3.pid=0x410a
+artronshop_rp2_nano.upload_port.4.vid=0x2e8a
+artronshop_rp2_nano.upload_port.4.pid=0x800a
+artronshop_rp2_nano.upload_port.5.vid=0x2e8a
+artronshop_rp2_nano.upload_port.5.pid=0x810a
+artronshop_rp2_nano.upload_port.6.vid=0x2e8a
+artronshop_rp2_nano.upload_port.6.pid=0xc00a
+artronshop_rp2_nano.upload_port.7.vid=0x2e8a
+artronshop_rp2_nano.upload_port.7.pid=0xc10a
 artronshop_rp2_nano.build.usbvid=-DUSBD_VID=0x2e8a
 artronshop_rp2_nano.build.usbpid=-DUSBD_PID=0x000a
 artronshop_rp2_nano.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -5151,6 +5083,22 @@ bridgetek_idm2040-7a.vid.6=0x2e8a
 bridgetek_idm2040-7a.pid.6=0xd041
 bridgetek_idm2040-7a.vid.7=0x2e8a
 bridgetek_idm2040-7a.pid.7=0xd141
+bridgetek_idm2040-7a.upload_port.0.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.0.pid=0x1041
+bridgetek_idm2040-7a.upload_port.1.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.1.pid=0x1141
+bridgetek_idm2040-7a.upload_port.2.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.2.pid=0x5041
+bridgetek_idm2040-7a.upload_port.3.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.3.pid=0x5141
+bridgetek_idm2040-7a.upload_port.4.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.4.pid=0x9041
+bridgetek_idm2040-7a.upload_port.5.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.5.pid=0x9141
+bridgetek_idm2040-7a.upload_port.6.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.6.pid=0xd041
+bridgetek_idm2040-7a.upload_port.7.vid=0x2e8a
+bridgetek_idm2040-7a.upload_port.7.pid=0xd141
 bridgetek_idm2040-7a.build.usbvid=-DUSBD_VID=0x2e8a
 bridgetek_idm2040-7a.build.usbpid=-DUSBD_PID=0x1041
 bridgetek_idm2040-7a.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -5398,6 +5346,22 @@ cytron_maker_nano_rp2040.vid.6=0x2e8a
 cytron_maker_nano_rp2040.pid.6=0xd00f
 cytron_maker_nano_rp2040.vid.7=0x2e8a
 cytron_maker_nano_rp2040.pid.7=0xd10f
+cytron_maker_nano_rp2040.upload_port.0.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.0.pid=0x100f
+cytron_maker_nano_rp2040.upload_port.1.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.1.pid=0x110f
+cytron_maker_nano_rp2040.upload_port.2.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.2.pid=0x500f
+cytron_maker_nano_rp2040.upload_port.3.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.3.pid=0x510f
+cytron_maker_nano_rp2040.upload_port.4.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.4.pid=0x900f
+cytron_maker_nano_rp2040.upload_port.5.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.5.pid=0x910f
+cytron_maker_nano_rp2040.upload_port.6.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.6.pid=0xd00f
+cytron_maker_nano_rp2040.upload_port.7.vid=0x2e8a
+cytron_maker_nano_rp2040.upload_port.7.pid=0xd10f
 cytron_maker_nano_rp2040.build.usbvid=-DUSBD_VID=0x2e8a
 cytron_maker_nano_rp2040.build.usbpid=-DUSBD_PID=0x100f
 cytron_maker_nano_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -5602,6 +5566,22 @@ cytron_maker_pi_rp2040.vid.6=0x2e8a
 cytron_maker_pi_rp2040.pid.6=0xd000
 cytron_maker_pi_rp2040.vid.7=0x2e8a
 cytron_maker_pi_rp2040.pid.7=0xd100
+cytron_maker_pi_rp2040.upload_port.0.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.0.pid=0x1000
+cytron_maker_pi_rp2040.upload_port.1.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.1.pid=0x1100
+cytron_maker_pi_rp2040.upload_port.2.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.2.pid=0x5000
+cytron_maker_pi_rp2040.upload_port.3.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.3.pid=0x5100
+cytron_maker_pi_rp2040.upload_port.4.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.4.pid=0x9000
+cytron_maker_pi_rp2040.upload_port.5.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.5.pid=0x9100
+cytron_maker_pi_rp2040.upload_port.6.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.6.pid=0xd000
+cytron_maker_pi_rp2040.upload_port.7.vid=0x2e8a
+cytron_maker_pi_rp2040.upload_port.7.pid=0xd100
 cytron_maker_pi_rp2040.build.usbvid=-DUSBD_VID=0x2e8a
 cytron_maker_pi_rp2040.build.usbpid=-DUSBD_PID=0x1000
 cytron_maker_pi_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -5806,6 +5786,22 @@ cytron_maker_uno_rp2040.vid.6=0x2e8a
 cytron_maker_uno_rp2040.pid.6=0xd071
 cytron_maker_uno_rp2040.vid.7=0x2e8a
 cytron_maker_uno_rp2040.pid.7=0xd171
+cytron_maker_uno_rp2040.upload_port.0.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.0.pid=0x1071
+cytron_maker_uno_rp2040.upload_port.1.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.1.pid=0x1171
+cytron_maker_uno_rp2040.upload_port.2.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.2.pid=0x5071
+cytron_maker_uno_rp2040.upload_port.3.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.3.pid=0x5171
+cytron_maker_uno_rp2040.upload_port.4.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.4.pid=0x9071
+cytron_maker_uno_rp2040.upload_port.5.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.5.pid=0x9171
+cytron_maker_uno_rp2040.upload_port.6.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.6.pid=0xd071
+cytron_maker_uno_rp2040.upload_port.7.vid=0x2e8a
+cytron_maker_uno_rp2040.upload_port.7.pid=0xd171
 cytron_maker_uno_rp2040.build.usbvid=-DUSBD_VID=0x2e8a
 cytron_maker_uno_rp2040.build.usbpid=-DUSBD_PID=0x1071
 cytron_maker_uno_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -6010,6 +6006,22 @@ datanoisetv_picoadk.vid.6=0x2e8a
 datanoisetv_picoadk.pid.6=0xc00a
 datanoisetv_picoadk.vid.7=0x2e8a
 datanoisetv_picoadk.pid.7=0xc10a
+datanoisetv_picoadk.upload_port.0.vid=0x2e8a
+datanoisetv_picoadk.upload_port.0.pid=0x000a
+datanoisetv_picoadk.upload_port.1.vid=0x2e8a
+datanoisetv_picoadk.upload_port.1.pid=0x010a
+datanoisetv_picoadk.upload_port.2.vid=0x2e8a
+datanoisetv_picoadk.upload_port.2.pid=0x400a
+datanoisetv_picoadk.upload_port.3.vid=0x2e8a
+datanoisetv_picoadk.upload_port.3.pid=0x410a
+datanoisetv_picoadk.upload_port.4.vid=0x2e8a
+datanoisetv_picoadk.upload_port.4.pid=0x800a
+datanoisetv_picoadk.upload_port.5.vid=0x2e8a
+datanoisetv_picoadk.upload_port.5.pid=0x810a
+datanoisetv_picoadk.upload_port.6.vid=0x2e8a
+datanoisetv_picoadk.upload_port.6.pid=0xc00a
+datanoisetv_picoadk.upload_port.7.vid=0x2e8a
+datanoisetv_picoadk.upload_port.7.pid=0xc10a
 datanoisetv_picoadk.build.usbvid=-DUSBD_VID=0x2e8a
 datanoisetv_picoadk.build.usbpid=-DUSBD_PID=0x000a
 datanoisetv_picoadk.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -6202,18 +6214,10 @@ degz_suibo.vid.0=0x2e8a
 degz_suibo.pid.0=0xf00a
 degz_suibo.vid.1=0x2e8a
 degz_suibo.pid.1=0xf10a
-degz_suibo.vid.2=0x2e8a
-degz_suibo.pid.2=0xf00a
-degz_suibo.vid.3=0x2e8a
-degz_suibo.pid.3=0xf10a
-degz_suibo.vid.4=0x2e8a
-degz_suibo.pid.4=0xf00a
-degz_suibo.vid.5=0x2e8a
-degz_suibo.pid.5=0xf10a
-degz_suibo.vid.6=0x2e8a
-degz_suibo.pid.6=0xf00a
-degz_suibo.vid.7=0x2e8a
-degz_suibo.pid.7=0xf10a
+degz_suibo.upload_port.0.vid=0x2e8a
+degz_suibo.upload_port.0.pid=0xf00a
+degz_suibo.upload_port.1.vid=0x2e8a
+degz_suibo.upload_port.1.pid=0xf10a
 degz_suibo.build.usbvid=-DUSBD_VID=0x2e8a
 degz_suibo.build.usbpid=-DUSBD_PID=0xf00a
 degz_suibo.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -6516,6 +6520,22 @@ flyboard2040_core.vid.6=0x2e8a
 flyboard2040_core.pid.6=0xc08a
 flyboard2040_core.vid.7=0x2e8a
 flyboard2040_core.pid.7=0xc18a
+flyboard2040_core.upload_port.0.vid=0x2e8a
+flyboard2040_core.upload_port.0.pid=0x008a
+flyboard2040_core.upload_port.1.vid=0x2e8a
+flyboard2040_core.upload_port.1.pid=0x018a
+flyboard2040_core.upload_port.2.vid=0x2e8a
+flyboard2040_core.upload_port.2.pid=0x408a
+flyboard2040_core.upload_port.3.vid=0x2e8a
+flyboard2040_core.upload_port.3.pid=0x418a
+flyboard2040_core.upload_port.4.vid=0x2e8a
+flyboard2040_core.upload_port.4.pid=0x808a
+flyboard2040_core.upload_port.5.vid=0x2e8a
+flyboard2040_core.upload_port.5.pid=0x818a
+flyboard2040_core.upload_port.6.vid=0x2e8a
+flyboard2040_core.upload_port.6.pid=0xc08a
+flyboard2040_core.upload_port.7.vid=0x2e8a
+flyboard2040_core.upload_port.7.pid=0xc18a
 flyboard2040_core.build.usbvid=-DUSBD_VID=0x2e8a
 flyboard2040_core.build.usbpid=-DUSBD_PID=0x008a
 flyboard2040_core.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -6723,17 +6743,17 @@ dfrobot_beetle_rp2040.pid.0=0x4253
 dfrobot_beetle_rp2040.vid.1=0x3343
 dfrobot_beetle_rp2040.pid.1=0x4353
 dfrobot_beetle_rp2040.vid.2=0x3343
-dfrobot_beetle_rp2040.pid.2=0x4253
+dfrobot_beetle_rp2040.pid.2=0xc253
 dfrobot_beetle_rp2040.vid.3=0x3343
-dfrobot_beetle_rp2040.pid.3=0x4353
-dfrobot_beetle_rp2040.vid.4=0x3343
-dfrobot_beetle_rp2040.pid.4=0xc253
-dfrobot_beetle_rp2040.vid.5=0x3343
-dfrobot_beetle_rp2040.pid.5=0xc353
-dfrobot_beetle_rp2040.vid.6=0x3343
-dfrobot_beetle_rp2040.pid.6=0xc253
-dfrobot_beetle_rp2040.vid.7=0x3343
-dfrobot_beetle_rp2040.pid.7=0xc353
+dfrobot_beetle_rp2040.pid.3=0xc353
+dfrobot_beetle_rp2040.upload_port.0.vid=0x3343
+dfrobot_beetle_rp2040.upload_port.0.pid=0x4253
+dfrobot_beetle_rp2040.upload_port.1.vid=0x3343
+dfrobot_beetle_rp2040.upload_port.1.pid=0x4353
+dfrobot_beetle_rp2040.upload_port.2.vid=0x3343
+dfrobot_beetle_rp2040.upload_port.2.pid=0xc253
+dfrobot_beetle_rp2040.upload_port.3.vid=0x3343
+dfrobot_beetle_rp2040.upload_port.3.pid=0xc353
 dfrobot_beetle_rp2040.build.usbvid=-DUSBD_VID=0x3343
 dfrobot_beetle_rp2040.build.usbpid=-DUSBD_PID=0x4253
 dfrobot_beetle_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -6938,8 +6958,24 @@ DudesCab.vid.6=0x2e8a
 DudesCab.pid.6=0xd06f
 DudesCab.vid.7=0x2e8a
 DudesCab.pid.7=0xd16f
+DudesCab.upload_port.0.vid=0x2e8a
+DudesCab.upload_port.0.pid=0x106f
+DudesCab.upload_port.1.vid=0x2e8a
+DudesCab.upload_port.1.pid=0x116f
+DudesCab.upload_port.2.vid=0x2e8a
+DudesCab.upload_port.2.pid=0x506f
+DudesCab.upload_port.3.vid=0x2e8a
+DudesCab.upload_port.3.pid=0x516f
+DudesCab.upload_port.4.vid=0x2e8a
+DudesCab.upload_port.4.pid=0x906f
+DudesCab.upload_port.5.vid=0x2e8a
+DudesCab.upload_port.5.pid=0x916f
+DudesCab.upload_port.6.vid=0x2e8a
+DudesCab.upload_port.6.pid=0xd06f
+DudesCab.upload_port.7.vid=0x2e8a
+DudesCab.upload_port.7.pid=0xd16f
 DudesCab.build.usbvid=-DUSBD_VID=0x2e8a
-DudesCab.build.usbpid=-DUSBD_PID=0x106F
+DudesCab.build.usbpid=-DUSBD_PID=0x106f
 DudesCab.build.usbpwr=-DUSBD_MAX_POWER_MA=250
 DudesCab.build.board=RASPBERRY_PI_PICO
 DudesCab.build.mcu=cortex-m0plus
@@ -7156,6 +7192,22 @@ electroniccats_huntercat_nfc.vid.6=0x2E8A
 electroniccats_huntercat_nfc.pid.6=0xd037
 electroniccats_huntercat_nfc.vid.7=0x2E8A
 electroniccats_huntercat_nfc.pid.7=0xd137
+electroniccats_huntercat_nfc.upload_port.0.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.0.pid=0x1037
+electroniccats_huntercat_nfc.upload_port.1.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.1.pid=0x1137
+electroniccats_huntercat_nfc.upload_port.2.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.2.pid=0x5037
+electroniccats_huntercat_nfc.upload_port.3.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.3.pid=0x5137
+electroniccats_huntercat_nfc.upload_port.4.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.4.pid=0x9037
+electroniccats_huntercat_nfc.upload_port.5.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.5.pid=0x9137
+electroniccats_huntercat_nfc.upload_port.6.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.6.pid=0xd037
+electroniccats_huntercat_nfc.upload_port.7.vid=0x2E8A
+electroniccats_huntercat_nfc.upload_port.7.pid=0xd137
 electroniccats_huntercat_nfc.build.usbvid=-DUSBD_VID=0x2E8A
 electroniccats_huntercat_nfc.build.usbpid=-DUSBD_PID=0x1037
 electroniccats_huntercat_nfc.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -7348,18 +7400,10 @@ extelec_rc2040.vid.0=0x2e8a
 extelec_rc2040.pid.0=0xee20
 extelec_rc2040.vid.1=0x2e8a
 extelec_rc2040.pid.1=0xef20
-extelec_rc2040.vid.2=0x2e8a
-extelec_rc2040.pid.2=0xee20
-extelec_rc2040.vid.3=0x2e8a
-extelec_rc2040.pid.3=0xef20
-extelec_rc2040.vid.4=0x2e8a
-extelec_rc2040.pid.4=0xee20
-extelec_rc2040.vid.5=0x2e8a
-extelec_rc2040.pid.5=0xef20
-extelec_rc2040.vid.6=0x2e8a
-extelec_rc2040.pid.6=0xee20
-extelec_rc2040.vid.7=0x2e8a
-extelec_rc2040.pid.7=0xef20
+extelec_rc2040.upload_port.0.vid=0x2e8a
+extelec_rc2040.upload_port.0.pid=0xee20
+extelec_rc2040.upload_port.1.vid=0x2e8a
+extelec_rc2040.upload_port.1.pid=0xef20
 extelec_rc2040.build.usbvid=-DUSBD_VID=0x2e8a
 extelec_rc2040.build.usbpid=-DUSBD_PID=0xee20
 extelec_rc2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -7564,6 +7608,22 @@ challenger_2040_lte.vid.6=0x2e8a
 challenger_2040_lte.pid.6=0xd00b
 challenger_2040_lte.vid.7=0x2e8a
 challenger_2040_lte.pid.7=0xd10b
+challenger_2040_lte.upload_port.0.vid=0x2e8a
+challenger_2040_lte.upload_port.0.pid=0x100b
+challenger_2040_lte.upload_port.1.vid=0x2e8a
+challenger_2040_lte.upload_port.1.pid=0x110b
+challenger_2040_lte.upload_port.2.vid=0x2e8a
+challenger_2040_lte.upload_port.2.pid=0x500b
+challenger_2040_lte.upload_port.3.vid=0x2e8a
+challenger_2040_lte.upload_port.3.pid=0x510b
+challenger_2040_lte.upload_port.4.vid=0x2e8a
+challenger_2040_lte.upload_port.4.pid=0x900b
+challenger_2040_lte.upload_port.5.vid=0x2e8a
+challenger_2040_lte.upload_port.5.pid=0x910b
+challenger_2040_lte.upload_port.6.vid=0x2e8a
+challenger_2040_lte.upload_port.6.pid=0xd00b
+challenger_2040_lte.upload_port.7.vid=0x2e8a
+challenger_2040_lte.upload_port.7.pid=0xd10b
 challenger_2040_lte.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_2040_lte.build.usbpid=-DUSBD_PID=0x100b
 challenger_2040_lte.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -7810,6 +7870,22 @@ challenger_2040_lora.vid.6=0x2e8a
 challenger_2040_lora.pid.6=0xd023
 challenger_2040_lora.vid.7=0x2e8a
 challenger_2040_lora.pid.7=0xd123
+challenger_2040_lora.upload_port.0.vid=0x2e8a
+challenger_2040_lora.upload_port.0.pid=0x1023
+challenger_2040_lora.upload_port.1.vid=0x2e8a
+challenger_2040_lora.upload_port.1.pid=0x1123
+challenger_2040_lora.upload_port.2.vid=0x2e8a
+challenger_2040_lora.upload_port.2.pid=0x5023
+challenger_2040_lora.upload_port.3.vid=0x2e8a
+challenger_2040_lora.upload_port.3.pid=0x5123
+challenger_2040_lora.upload_port.4.vid=0x2e8a
+challenger_2040_lora.upload_port.4.pid=0x9023
+challenger_2040_lora.upload_port.5.vid=0x2e8a
+challenger_2040_lora.upload_port.5.pid=0x9123
+challenger_2040_lora.upload_port.6.vid=0x2e8a
+challenger_2040_lora.upload_port.6.pid=0xd023
+challenger_2040_lora.upload_port.7.vid=0x2e8a
+challenger_2040_lora.upload_port.7.pid=0xd123
 challenger_2040_lora.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_2040_lora.build.usbpid=-DUSBD_PID=0x1023
 challenger_2040_lora.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -8056,6 +8132,22 @@ challenger_2040_subghz.vid.6=0x2e8a
 challenger_2040_subghz.pid.6=0xd032
 challenger_2040_subghz.vid.7=0x2e8a
 challenger_2040_subghz.pid.7=0xd132
+challenger_2040_subghz.upload_port.0.vid=0x2e8a
+challenger_2040_subghz.upload_port.0.pid=0x1032
+challenger_2040_subghz.upload_port.1.vid=0x2e8a
+challenger_2040_subghz.upload_port.1.pid=0x1132
+challenger_2040_subghz.upload_port.2.vid=0x2e8a
+challenger_2040_subghz.upload_port.2.pid=0x5032
+challenger_2040_subghz.upload_port.3.vid=0x2e8a
+challenger_2040_subghz.upload_port.3.pid=0x5132
+challenger_2040_subghz.upload_port.4.vid=0x2e8a
+challenger_2040_subghz.upload_port.4.pid=0x9032
+challenger_2040_subghz.upload_port.5.vid=0x2e8a
+challenger_2040_subghz.upload_port.5.pid=0x9132
+challenger_2040_subghz.upload_port.6.vid=0x2e8a
+challenger_2040_subghz.upload_port.6.pid=0xd032
+challenger_2040_subghz.upload_port.7.vid=0x2e8a
+challenger_2040_subghz.upload_port.7.pid=0xd132
 challenger_2040_subghz.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_2040_subghz.build.usbpid=-DUSBD_PID=0x1032
 challenger_2040_subghz.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -8302,6 +8394,22 @@ challenger_2040_wifi.vid.6=0x2e8a
 challenger_2040_wifi.pid.6=0xd006
 challenger_2040_wifi.vid.7=0x2e8a
 challenger_2040_wifi.pid.7=0xd106
+challenger_2040_wifi.upload_port.0.vid=0x2e8a
+challenger_2040_wifi.upload_port.0.pid=0x1006
+challenger_2040_wifi.upload_port.1.vid=0x2e8a
+challenger_2040_wifi.upload_port.1.pid=0x1106
+challenger_2040_wifi.upload_port.2.vid=0x2e8a
+challenger_2040_wifi.upload_port.2.pid=0x5006
+challenger_2040_wifi.upload_port.3.vid=0x2e8a
+challenger_2040_wifi.upload_port.3.pid=0x5106
+challenger_2040_wifi.upload_port.4.vid=0x2e8a
+challenger_2040_wifi.upload_port.4.pid=0x9006
+challenger_2040_wifi.upload_port.5.vid=0x2e8a
+challenger_2040_wifi.upload_port.5.pid=0x9106
+challenger_2040_wifi.upload_port.6.vid=0x2e8a
+challenger_2040_wifi.upload_port.6.pid=0xd006
+challenger_2040_wifi.upload_port.7.vid=0x2e8a
+challenger_2040_wifi.upload_port.7.pid=0xd106
 challenger_2040_wifi.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_2040_wifi.build.usbpid=-DUSBD_PID=0x1006
 challenger_2040_wifi.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -8549,8 +8657,24 @@ challenger_2040_wifi_ble.vid.6=0x2e8a
 challenger_2040_wifi_ble.pid.6=0xd02c
 challenger_2040_wifi_ble.vid.7=0x2e8a
 challenger_2040_wifi_ble.pid.7=0xd12c
+challenger_2040_wifi_ble.upload_port.0.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.0.pid=0x102c
+challenger_2040_wifi_ble.upload_port.1.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.1.pid=0x112c
+challenger_2040_wifi_ble.upload_port.2.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.2.pid=0x502c
+challenger_2040_wifi_ble.upload_port.3.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.3.pid=0x512c
+challenger_2040_wifi_ble.upload_port.4.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.4.pid=0x902c
+challenger_2040_wifi_ble.upload_port.5.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.5.pid=0x912c
+challenger_2040_wifi_ble.upload_port.6.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.6.pid=0xd02c
+challenger_2040_wifi_ble.upload_port.7.vid=0x2e8a
+challenger_2040_wifi_ble.upload_port.7.pid=0xd12c
 challenger_2040_wifi_ble.build.usbvid=-DUSBD_VID=0x2e8a
-challenger_2040_wifi_ble.build.usbpid=-DUSBD_PID=0x102C
+challenger_2040_wifi_ble.build.usbpid=-DUSBD_PID=0x102c
 challenger_2040_wifi_ble.build.usbpwr=-DUSBD_MAX_POWER_MA=500
 challenger_2040_wifi_ble.build.board=CHALLENGER_2040_WIFI_BLE_RP2040
 challenger_2040_wifi_ble.build.mcu=cortex-m0plus
@@ -8796,8 +8920,24 @@ challenger_2040_wifi6_ble.vid.6=0x2e8a
 challenger_2040_wifi6_ble.pid.6=0xd05f
 challenger_2040_wifi6_ble.vid.7=0x2e8a
 challenger_2040_wifi6_ble.pid.7=0xd15f
+challenger_2040_wifi6_ble.upload_port.0.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.0.pid=0x105f
+challenger_2040_wifi6_ble.upload_port.1.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.1.pid=0x115f
+challenger_2040_wifi6_ble.upload_port.2.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.2.pid=0x505f
+challenger_2040_wifi6_ble.upload_port.3.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.3.pid=0x515f
+challenger_2040_wifi6_ble.upload_port.4.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.4.pid=0x905f
+challenger_2040_wifi6_ble.upload_port.5.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.5.pid=0x915f
+challenger_2040_wifi6_ble.upload_port.6.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.6.pid=0xd05f
+challenger_2040_wifi6_ble.upload_port.7.vid=0x2e8a
+challenger_2040_wifi6_ble.upload_port.7.pid=0xd15f
 challenger_2040_wifi6_ble.build.usbvid=-DUSBD_VID=0x2e8a
-challenger_2040_wifi6_ble.build.usbpid=-DUSBD_PID=0x105F
+challenger_2040_wifi6_ble.build.usbpid=-DUSBD_PID=0x105f
 challenger_2040_wifi6_ble.build.usbpwr=-DUSBD_MAX_POWER_MA=500
 challenger_2040_wifi6_ble.build.board=CHALLENGER_2040_WIFI6_BLE_RP2040
 challenger_2040_wifi6_ble.build.mcu=cortex-m0plus
@@ -9043,6 +9183,22 @@ challenger_nb_2040_wifi.vid.6=0x2e8a
 challenger_nb_2040_wifi.pid.6=0xd00d
 challenger_nb_2040_wifi.vid.7=0x2e8a
 challenger_nb_2040_wifi.pid.7=0xd10d
+challenger_nb_2040_wifi.upload_port.0.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.0.pid=0x100d
+challenger_nb_2040_wifi.upload_port.1.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.1.pid=0x110d
+challenger_nb_2040_wifi.upload_port.2.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.2.pid=0x500d
+challenger_nb_2040_wifi.upload_port.3.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.3.pid=0x510d
+challenger_nb_2040_wifi.upload_port.4.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.4.pid=0x900d
+challenger_nb_2040_wifi.upload_port.5.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.5.pid=0x910d
+challenger_nb_2040_wifi.upload_port.6.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.6.pid=0xd00d
+challenger_nb_2040_wifi.upload_port.7.vid=0x2e8a
+challenger_nb_2040_wifi.upload_port.7.pid=0xd10d
 challenger_nb_2040_wifi.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_nb_2040_wifi.build.usbpid=-DUSBD_PID=0x100d
 challenger_nb_2040_wifi.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -9290,6 +9446,22 @@ challenger_2040_sdrtc.vid.6=0x2e8a
 challenger_2040_sdrtc.pid.6=0xd02d
 challenger_2040_sdrtc.vid.7=0x2e8a
 challenger_2040_sdrtc.pid.7=0xd12d
+challenger_2040_sdrtc.upload_port.0.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.0.pid=0x102d
+challenger_2040_sdrtc.upload_port.1.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.1.pid=0x112d
+challenger_2040_sdrtc.upload_port.2.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.2.pid=0x502d
+challenger_2040_sdrtc.upload_port.3.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.3.pid=0x512d
+challenger_2040_sdrtc.upload_port.4.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.4.pid=0x902d
+challenger_2040_sdrtc.upload_port.5.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.5.pid=0x912d
+challenger_2040_sdrtc.upload_port.6.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.6.pid=0xd02d
+challenger_2040_sdrtc.upload_port.7.vid=0x2e8a
+challenger_2040_sdrtc.upload_port.7.pid=0xd12d
 challenger_2040_sdrtc.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_2040_sdrtc.build.usbpid=-DUSBD_PID=0x102d
 challenger_2040_sdrtc.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -9536,6 +9708,22 @@ challenger_2040_nfc.vid.6=0x2e8a
 challenger_2040_nfc.pid.6=0xd036
 challenger_2040_nfc.vid.7=0x2e8a
 challenger_2040_nfc.pid.7=0xd136
+challenger_2040_nfc.upload_port.0.vid=0x2e8a
+challenger_2040_nfc.upload_port.0.pid=0x1036
+challenger_2040_nfc.upload_port.1.vid=0x2e8a
+challenger_2040_nfc.upload_port.1.pid=0x1136
+challenger_2040_nfc.upload_port.2.vid=0x2e8a
+challenger_2040_nfc.upload_port.2.pid=0x5036
+challenger_2040_nfc.upload_port.3.vid=0x2e8a
+challenger_2040_nfc.upload_port.3.pid=0x5136
+challenger_2040_nfc.upload_port.4.vid=0x2e8a
+challenger_2040_nfc.upload_port.4.pid=0x9036
+challenger_2040_nfc.upload_port.5.vid=0x2e8a
+challenger_2040_nfc.upload_port.5.pid=0x9136
+challenger_2040_nfc.upload_port.6.vid=0x2e8a
+challenger_2040_nfc.upload_port.6.pid=0xd036
+challenger_2040_nfc.upload_port.7.vid=0x2e8a
+challenger_2040_nfc.upload_port.7.pid=0xd136
 challenger_2040_nfc.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_2040_nfc.build.usbpid=-DUSBD_PID=0x1036
 challenger_2040_nfc.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -9782,6 +9970,22 @@ challenger_2040_uwb.vid.6=0x2e8a
 challenger_2040_uwb.pid.6=0xd052
 challenger_2040_uwb.vid.7=0x2e8a
 challenger_2040_uwb.pid.7=0xd152
+challenger_2040_uwb.upload_port.0.vid=0x2e8a
+challenger_2040_uwb.upload_port.0.pid=0x1052
+challenger_2040_uwb.upload_port.1.vid=0x2e8a
+challenger_2040_uwb.upload_port.1.pid=0x1152
+challenger_2040_uwb.upload_port.2.vid=0x2e8a
+challenger_2040_uwb.upload_port.2.pid=0x5052
+challenger_2040_uwb.upload_port.3.vid=0x2e8a
+challenger_2040_uwb.upload_port.3.pid=0x5152
+challenger_2040_uwb.upload_port.4.vid=0x2e8a
+challenger_2040_uwb.upload_port.4.pid=0x9052
+challenger_2040_uwb.upload_port.5.vid=0x2e8a
+challenger_2040_uwb.upload_port.5.pid=0x9152
+challenger_2040_uwb.upload_port.6.vid=0x2e8a
+challenger_2040_uwb.upload_port.6.pid=0xd052
+challenger_2040_uwb.upload_port.7.vid=0x2e8a
+challenger_2040_uwb.upload_port.7.pid=0xd152
 challenger_2040_uwb.build.usbvid=-DUSBD_VID=0x2e8a
 challenger_2040_uwb.build.usbpid=-DUSBD_PID=0x1052
 challenger_2040_uwb.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -10028,6 +10232,22 @@ connectivity_2040_lte_wifi_ble.vid.6=0x2e8a
 connectivity_2040_lte_wifi_ble.pid.6=0xd07b
 connectivity_2040_lte_wifi_ble.vid.7=0x2e8a
 connectivity_2040_lte_wifi_ble.pid.7=0xd17b
+connectivity_2040_lte_wifi_ble.upload_port.0.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.0.pid=0x107b
+connectivity_2040_lte_wifi_ble.upload_port.1.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.1.pid=0x117b
+connectivity_2040_lte_wifi_ble.upload_port.2.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.2.pid=0x507b
+connectivity_2040_lte_wifi_ble.upload_port.3.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.3.pid=0x517b
+connectivity_2040_lte_wifi_ble.upload_port.4.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.4.pid=0x907b
+connectivity_2040_lte_wifi_ble.upload_port.5.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.5.pid=0x917b
+connectivity_2040_lte_wifi_ble.upload_port.6.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.6.pid=0xd07b
+connectivity_2040_lte_wifi_ble.upload_port.7.vid=0x2e8a
+connectivity_2040_lte_wifi_ble.upload_port.7.pid=0xd17b
 connectivity_2040_lte_wifi_ble.build.usbvid=-DUSBD_VID=0x2e8a
 connectivity_2040_lte_wifi_ble.build.usbpid=-DUSBD_PID=0x107b
 connectivity_2040_lte_wifi_ble.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -10275,6 +10495,22 @@ ilabs_rpico32.vid.6=0x2e8a
 ilabs_rpico32.pid.6=0xd010
 ilabs_rpico32.vid.7=0x2e8a
 ilabs_rpico32.pid.7=0xd110
+ilabs_rpico32.upload_port.0.vid=0x2e8a
+ilabs_rpico32.upload_port.0.pid=0x1010
+ilabs_rpico32.upload_port.1.vid=0x2e8a
+ilabs_rpico32.upload_port.1.pid=0x1110
+ilabs_rpico32.upload_port.2.vid=0x2e8a
+ilabs_rpico32.upload_port.2.pid=0x5010
+ilabs_rpico32.upload_port.3.vid=0x2e8a
+ilabs_rpico32.upload_port.3.pid=0x5110
+ilabs_rpico32.upload_port.4.vid=0x2e8a
+ilabs_rpico32.upload_port.4.pid=0x9010
+ilabs_rpico32.upload_port.5.vid=0x2e8a
+ilabs_rpico32.upload_port.5.pid=0x9110
+ilabs_rpico32.upload_port.6.vid=0x2e8a
+ilabs_rpico32.upload_port.6.pid=0xd010
+ilabs_rpico32.upload_port.7.vid=0x2e8a
+ilabs_rpico32.upload_port.7.pid=0xd110
 ilabs_rpico32.build.usbvid=-DUSBD_VID=0x2e8a
 ilabs_rpico32.build.usbpid=-DUSBD_PID=0x1010
 ilabs_rpico32.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -10522,6 +10758,22 @@ melopero_cookie_rp2040.vid.6=0x2e8a
 melopero_cookie_rp2040.pid.6=0xd011
 melopero_cookie_rp2040.vid.7=0x2e8a
 melopero_cookie_rp2040.pid.7=0xd111
+melopero_cookie_rp2040.upload_port.0.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.0.pid=0x1011
+melopero_cookie_rp2040.upload_port.1.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.1.pid=0x1111
+melopero_cookie_rp2040.upload_port.2.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.2.pid=0x5011
+melopero_cookie_rp2040.upload_port.3.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.3.pid=0x5111
+melopero_cookie_rp2040.upload_port.4.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.4.pid=0x9011
+melopero_cookie_rp2040.upload_port.5.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.5.pid=0x9111
+melopero_cookie_rp2040.upload_port.6.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.6.pid=0xd011
+melopero_cookie_rp2040.upload_port.7.vid=0x2e8a
+melopero_cookie_rp2040.upload_port.7.pid=0xd111
 melopero_cookie_rp2040.build.usbvid=-DUSBD_VID=0x2e8a
 melopero_cookie_rp2040.build.usbpid=-DUSBD_PID=0x1011
 melopero_cookie_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -10768,6 +11020,22 @@ melopero_shake_rp2040.vid.6=0x2e8a
 melopero_shake_rp2040.pid.6=0xd005
 melopero_shake_rp2040.vid.7=0x2e8a
 melopero_shake_rp2040.pid.7=0xd105
+melopero_shake_rp2040.upload_port.0.vid=0x2e8a
+melopero_shake_rp2040.upload_port.0.pid=0x1005
+melopero_shake_rp2040.upload_port.1.vid=0x2e8a
+melopero_shake_rp2040.upload_port.1.pid=0x1105
+melopero_shake_rp2040.upload_port.2.vid=0x2e8a
+melopero_shake_rp2040.upload_port.2.pid=0x5005
+melopero_shake_rp2040.upload_port.3.vid=0x2e8a
+melopero_shake_rp2040.upload_port.3.pid=0x5105
+melopero_shake_rp2040.upload_port.4.vid=0x2e8a
+melopero_shake_rp2040.upload_port.4.pid=0x9005
+melopero_shake_rp2040.upload_port.5.vid=0x2e8a
+melopero_shake_rp2040.upload_port.5.pid=0x9105
+melopero_shake_rp2040.upload_port.6.vid=0x2e8a
+melopero_shake_rp2040.upload_port.6.pid=0xd005
+melopero_shake_rp2040.upload_port.7.vid=0x2e8a
+melopero_shake_rp2040.upload_port.7.pid=0xd105
 melopero_shake_rp2040.build.usbvid=-DUSBD_VID=0x2e8a
 melopero_shake_rp2040.build.usbpid=-DUSBD_PID=0x1005
 melopero_shake_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -11070,6 +11338,22 @@ nekosystems_bl2040_mini.vid.6=0x2e8a
 nekosystems_bl2040_mini.pid.6=0xc00a
 nekosystems_bl2040_mini.vid.7=0x2e8a
 nekosystems_bl2040_mini.pid.7=0xc10a
+nekosystems_bl2040_mini.upload_port.0.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.0.pid=0x000a
+nekosystems_bl2040_mini.upload_port.1.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.1.pid=0x010a
+nekosystems_bl2040_mini.upload_port.2.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.2.pid=0x400a
+nekosystems_bl2040_mini.upload_port.3.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.3.pid=0x410a
+nekosystems_bl2040_mini.upload_port.4.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.4.pid=0x800a
+nekosystems_bl2040_mini.upload_port.5.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.5.pid=0x810a
+nekosystems_bl2040_mini.upload_port.6.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.6.pid=0xc00a
+nekosystems_bl2040_mini.upload_port.7.vid=0x2e8a
+nekosystems_bl2040_mini.upload_port.7.pid=0xc10a
 nekosystems_bl2040_mini.build.usbvid=-DUSBD_VID=0x2e8a
 nekosystems_bl2040_mini.build.usbpid=-DUSBD_PID=0x000a
 nekosystems_bl2040_mini.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -11277,17 +11561,17 @@ nullbits_bit_c_pro.pid.0=0x6e61
 nullbits_bit_c_pro.vid.1=0x2e8a
 nullbits_bit_c_pro.pid.1=0x6f61
 nullbits_bit_c_pro.vid.2=0x2e8a
-nullbits_bit_c_pro.pid.2=0x6e61
+nullbits_bit_c_pro.pid.2=0xee61
 nullbits_bit_c_pro.vid.3=0x2e8a
-nullbits_bit_c_pro.pid.3=0x6f61
-nullbits_bit_c_pro.vid.4=0x2e8a
-nullbits_bit_c_pro.pid.4=0xee61
-nullbits_bit_c_pro.vid.5=0x2e8a
-nullbits_bit_c_pro.pid.5=0xef61
-nullbits_bit_c_pro.vid.6=0x2e8a
-nullbits_bit_c_pro.pid.6=0xee61
-nullbits_bit_c_pro.vid.7=0x2e8a
-nullbits_bit_c_pro.pid.7=0xef61
+nullbits_bit_c_pro.pid.3=0xef61
+nullbits_bit_c_pro.upload_port.0.vid=0x2e8a
+nullbits_bit_c_pro.upload_port.0.pid=0x6e61
+nullbits_bit_c_pro.upload_port.1.vid=0x2e8a
+nullbits_bit_c_pro.upload_port.1.pid=0x6f61
+nullbits_bit_c_pro.upload_port.2.vid=0x2e8a
+nullbits_bit_c_pro.upload_port.2.pid=0xee61
+nullbits_bit_c_pro.upload_port.3.vid=0x2e8a
+nullbits_bit_c_pro.upload_port.3.pid=0xef61
 nullbits_bit_c_pro.build.usbvid=-DUSBD_VID=0x2e8a
 nullbits_bit_c_pro.build.usbpid=-DUSBD_PID=0x6e61
 nullbits_bit_c_pro.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -11506,6 +11790,22 @@ olimex_rp2040pico30_2mb.vid.6=0x15ba
 olimex_rp2040pico30_2mb.pid.6=0xc026
 olimex_rp2040pico30_2mb.vid.7=0x15ba
 olimex_rp2040pico30_2mb.pid.7=0xc126
+olimex_rp2040pico30_2mb.upload_port.0.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.0.pid=0x0026
+olimex_rp2040pico30_2mb.upload_port.1.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.1.pid=0x0126
+olimex_rp2040pico30_2mb.upload_port.2.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.2.pid=0x4026
+olimex_rp2040pico30_2mb.upload_port.3.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.3.pid=0x4126
+olimex_rp2040pico30_2mb.upload_port.4.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.4.pid=0x8026
+olimex_rp2040pico30_2mb.upload_port.5.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.5.pid=0x8126
+olimex_rp2040pico30_2mb.upload_port.6.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.6.pid=0xc026
+olimex_rp2040pico30_2mb.upload_port.7.vid=0x15ba
+olimex_rp2040pico30_2mb.upload_port.7.pid=0xc126
 olimex_rp2040pico30_2mb.build.usbvid=-DUSBD_VID=0x15ba
 olimex_rp2040pico30_2mb.build.usbpid=-DUSBD_PID=0x0026
 olimex_rp2040pico30_2mb.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -11710,6 +12010,22 @@ olimex_rp2040pico30_16mb.vid.6=0x15ba
 olimex_rp2040pico30_16mb.pid.6=0xc026
 olimex_rp2040pico30_16mb.vid.7=0x15ba
 olimex_rp2040pico30_16mb.pid.7=0xc126
+olimex_rp2040pico30_16mb.upload_port.0.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.0.pid=0x0026
+olimex_rp2040pico30_16mb.upload_port.1.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.1.pid=0x0126
+olimex_rp2040pico30_16mb.upload_port.2.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.2.pid=0x4026
+olimex_rp2040pico30_16mb.upload_port.3.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.3.pid=0x4126
+olimex_rp2040pico30_16mb.upload_port.4.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.4.pid=0x8026
+olimex_rp2040pico30_16mb.upload_port.5.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.5.pid=0x8126
+olimex_rp2040pico30_16mb.upload_port.6.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.6.pid=0xc026
+olimex_rp2040pico30_16mb.upload_port.7.vid=0x15ba
+olimex_rp2040pico30_16mb.upload_port.7.pid=0xc126
 olimex_rp2040pico30_16mb.build.usbvid=-DUSBD_VID=0x15ba
 olimex_rp2040pico30_16mb.build.usbpid=-DUSBD_PID=0x0026
 olimex_rp2040pico30_16mb.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -12012,6 +12328,22 @@ pimoroni_pga2040.vid.6=0x2e8a
 pimoroni_pga2040.pid.6=0xd008
 pimoroni_pga2040.vid.7=0x2e8a
 pimoroni_pga2040.pid.7=0xd108
+pimoroni_pga2040.upload_port.0.vid=0x2e8a
+pimoroni_pga2040.upload_port.0.pid=0x1008
+pimoroni_pga2040.upload_port.1.vid=0x2e8a
+pimoroni_pga2040.upload_port.1.pid=0x1108
+pimoroni_pga2040.upload_port.2.vid=0x2e8a
+pimoroni_pga2040.upload_port.2.pid=0x5008
+pimoroni_pga2040.upload_port.3.vid=0x2e8a
+pimoroni_pga2040.upload_port.3.pid=0x5108
+pimoroni_pga2040.upload_port.4.vid=0x2e8a
+pimoroni_pga2040.upload_port.4.pid=0x9008
+pimoroni_pga2040.upload_port.5.vid=0x2e8a
+pimoroni_pga2040.upload_port.5.pid=0x9108
+pimoroni_pga2040.upload_port.6.vid=0x2e8a
+pimoroni_pga2040.upload_port.6.pid=0xd008
+pimoroni_pga2040.upload_port.7.vid=0x2e8a
+pimoroni_pga2040.upload_port.7.pid=0xd108
 pimoroni_pga2040.build.usbvid=-DUSBD_VID=0x2e8a
 pimoroni_pga2040.build.usbpid=-DUSBD_PID=0x1008
 pimoroni_pga2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -12258,6 +12590,22 @@ pimoroni_plasma2040.vid.6=0x2e8a
 pimoroni_plasma2040.pid.6=0xd00a
 pimoroni_plasma2040.vid.7=0x2e8a
 pimoroni_plasma2040.pid.7=0xd10a
+pimoroni_plasma2040.upload_port.0.vid=0x2e8a
+pimoroni_plasma2040.upload_port.0.pid=0x100a
+pimoroni_plasma2040.upload_port.1.vid=0x2e8a
+pimoroni_plasma2040.upload_port.1.pid=0x110a
+pimoroni_plasma2040.upload_port.2.vid=0x2e8a
+pimoroni_plasma2040.upload_port.2.pid=0x500a
+pimoroni_plasma2040.upload_port.3.vid=0x2e8a
+pimoroni_plasma2040.upload_port.3.pid=0x510a
+pimoroni_plasma2040.upload_port.4.vid=0x2e8a
+pimoroni_plasma2040.upload_port.4.pid=0x900a
+pimoroni_plasma2040.upload_port.5.vid=0x2e8a
+pimoroni_plasma2040.upload_port.5.pid=0x910a
+pimoroni_plasma2040.upload_port.6.vid=0x2e8a
+pimoroni_plasma2040.upload_port.6.pid=0xd00a
+pimoroni_plasma2040.upload_port.7.vid=0x2e8a
+pimoroni_plasma2040.upload_port.7.pid=0xd10a
 pimoroni_plasma2040.build.usbvid=-DUSBD_VID=0x2e8a
 pimoroni_plasma2040.build.usbpid=-DUSBD_PID=0x100a
 pimoroni_plasma2040.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -12462,6 +12810,22 @@ pimoroni_tiny2040.vid.6=0x2e8a
 pimoroni_tiny2040.pid.6=0xd00a
 pimoroni_tiny2040.vid.7=0x2e8a
 pimoroni_tiny2040.pid.7=0xd10a
+pimoroni_tiny2040.upload_port.0.vid=0x2e8a
+pimoroni_tiny2040.upload_port.0.pid=0x100a
+pimoroni_tiny2040.upload_port.1.vid=0x2e8a
+pimoroni_tiny2040.upload_port.1.pid=0x110a
+pimoroni_tiny2040.upload_port.2.vid=0x2e8a
+pimoroni_tiny2040.upload_port.2.pid=0x500a
+pimoroni_tiny2040.upload_port.3.vid=0x2e8a
+pimoroni_tiny2040.upload_port.3.pid=0x510a
+pimoroni_tiny2040.upload_port.4.vid=0x2e8a
+pimoroni_tiny2040.upload_port.4.pid=0x900a
+pimoroni_tiny2040.upload_port.5.vid=0x2e8a
+pimoroni_tiny2040.upload_port.5.pid=0x910a
+pimoroni_tiny2040.upload_port.6.vid=0x2e8a
+pimoroni_tiny2040.upload_port.6.pid=0xd00a
+pimoroni_tiny2040.upload_port.7.vid=0x2e8a
+pimoroni_tiny2040.upload_port.7.pid=0xd10a
 pimoroni_tiny2040.build.usbvid=-DUSBD_VID=0x2e8a
 pimoroni_tiny2040.build.usbpid=-DUSBD_PID=0x100a
 pimoroni_tiny2040.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -12694,6 +13058,22 @@ rakwireless_rak11300.vid.6=0x2e8a
 rakwireless_rak11300.pid.6=0xc0c0
 rakwireless_rak11300.vid.7=0x2e8a
 rakwireless_rak11300.pid.7=0xc1c0
+rakwireless_rak11300.upload_port.0.vid=0x2e8a
+rakwireless_rak11300.upload_port.0.pid=0x00c0
+rakwireless_rak11300.upload_port.1.vid=0x2e8a
+rakwireless_rak11300.upload_port.1.pid=0x01c0
+rakwireless_rak11300.upload_port.2.vid=0x2e8a
+rakwireless_rak11300.upload_port.2.pid=0x40c0
+rakwireless_rak11300.upload_port.3.vid=0x2e8a
+rakwireless_rak11300.upload_port.3.pid=0x41c0
+rakwireless_rak11300.upload_port.4.vid=0x2e8a
+rakwireless_rak11300.upload_port.4.pid=0x80c0
+rakwireless_rak11300.upload_port.5.vid=0x2e8a
+rakwireless_rak11300.upload_port.5.pid=0x81c0
+rakwireless_rak11300.upload_port.6.vid=0x2e8a
+rakwireless_rak11300.upload_port.6.pid=0xc0c0
+rakwireless_rak11300.upload_port.7.vid=0x2e8a
+rakwireless_rak11300.upload_port.7.pid=0xc1c0
 rakwireless_rak11300.build.usbvid=-DUSBD_VID=0x2e8a
 rakwireless_rak11300.build.usbpid=-DUSBD_PID=0x00c0
 rakwireless_rak11300.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -12890,6 +13270,14 @@ redscorp_rp2040_eins.vid.2=0x2341
 redscorp_rp2040_eins.pid.2=0x015f
 redscorp_rp2040_eins.vid.3=0x2341
 redscorp_rp2040_eins.pid.3=0x025f
+redscorp_rp2040_eins.upload_port.0.vid=0x2341
+redscorp_rp2040_eins.upload_port.0.pid=0x005f
+redscorp_rp2040_eins.upload_port.1.vid=0x2341
+redscorp_rp2040_eins.upload_port.1.pid=0x805f
+redscorp_rp2040_eins.upload_port.2.vid=0x2341
+redscorp_rp2040_eins.upload_port.2.pid=0x015f
+redscorp_rp2040_eins.upload_port.3.vid=0x2341
+redscorp_rp2040_eins.upload_port.3.pid=0x025f
 redscorp_rp2040_eins.build.usbvid=-DUSBD_VID=0x2341
 redscorp_rp2040_eins.build.usbpid=-DUSBD_PID=0x005f
 redscorp_rp2040_eins.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -13184,6 +13572,14 @@ redscorp_rp2040_promini.vid.2=0x2341
 redscorp_rp2040_promini.pid.2=0x015f
 redscorp_rp2040_promini.vid.3=0x2341
 redscorp_rp2040_promini.pid.3=0x025f
+redscorp_rp2040_promini.upload_port.0.vid=0x2341
+redscorp_rp2040_promini.upload_port.0.pid=0x005f
+redscorp_rp2040_promini.upload_port.1.vid=0x2341
+redscorp_rp2040_promini.upload_port.1.pid=0x805f
+redscorp_rp2040_promini.upload_port.2.vid=0x2341
+redscorp_rp2040_promini.upload_port.2.pid=0x015f
+redscorp_rp2040_promini.upload_port.3.vid=0x2341
+redscorp_rp2040_promini.upload_port.3.pid=0x025f
 redscorp_rp2040_promini.build.usbvid=-DUSBD_VID=0x2341
 redscorp_rp2040_promini.build.usbpid=-DUSBD_PID=0x005f
 redscorp_rp2040_promini.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -13474,18 +13870,10 @@ sea_picro.vid.0=0x2e8a
 sea_picro.pid.0=0xf00a
 sea_picro.vid.1=0x2e8a
 sea_picro.pid.1=0xf10a
-sea_picro.vid.2=0x2e8a
-sea_picro.pid.2=0xf00a
-sea_picro.vid.3=0x2e8a
-sea_picro.pid.3=0xf10a
-sea_picro.vid.4=0x2e8a
-sea_picro.pid.4=0xf00a
-sea_picro.vid.5=0x2e8a
-sea_picro.pid.5=0xf10a
-sea_picro.vid.6=0x2e8a
-sea_picro.pid.6=0xf00a
-sea_picro.vid.7=0x2e8a
-sea_picro.pid.7=0xf10a
+sea_picro.upload_port.0.vid=0x2e8a
+sea_picro.upload_port.0.pid=0xf00a
+sea_picro.upload_port.1.vid=0x2e8a
+sea_picro.upload_port.1.pid=0xf10a
 sea_picro.build.usbvid=-DUSBD_VID=0x2e8a
 sea_picro.build.usbpid=-DUSBD_PID=0xf00a
 sea_picro.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -13718,20 +14106,8 @@ sea_picro.menu.uploadmethod.picodebug.upload.tool.default=picodebug
 silicognition_rp2040_shim.name=Silicognition RP2040-Shim
 silicognition_rp2040_shim.vid.0=0x1209
 silicognition_rp2040_shim.pid.0=0xf502
-silicognition_rp2040_shim.vid.1=0x1209
-silicognition_rp2040_shim.pid.1=0xf502
-silicognition_rp2040_shim.vid.2=0x1209
-silicognition_rp2040_shim.pid.2=0xf502
-silicognition_rp2040_shim.vid.3=0x1209
-silicognition_rp2040_shim.pid.3=0xf502
-silicognition_rp2040_shim.vid.4=0x1209
-silicognition_rp2040_shim.pid.4=0xf502
-silicognition_rp2040_shim.vid.5=0x1209
-silicognition_rp2040_shim.pid.5=0xf502
-silicognition_rp2040_shim.vid.6=0x1209
-silicognition_rp2040_shim.pid.6=0xf502
-silicognition_rp2040_shim.vid.7=0x1209
-silicognition_rp2040_shim.pid.7=0xf502
+silicognition_rp2040_shim.upload_port.0.vid=0x1209
+silicognition_rp2040_shim.upload_port.0.pid=0xf502
 silicognition_rp2040_shim.build.usbvid=-DUSBD_VID=0x1209
 silicognition_rp2040_shim.build.usbpid=-DUSBD_PID=0xf502
 silicognition_rp2040_shim.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -13937,19 +14313,11 @@ solderparty_rp2040_stamp.name=Solder Party RP2040 Stamp
 solderparty_rp2040_stamp.vid.0=0x1209
 solderparty_rp2040_stamp.pid.0=0xa182
 solderparty_rp2040_stamp.vid.1=0x1209
-solderparty_rp2040_stamp.pid.1=0xa182
-solderparty_rp2040_stamp.vid.2=0x1209
-solderparty_rp2040_stamp.pid.2=0xe182
-solderparty_rp2040_stamp.vid.3=0x1209
-solderparty_rp2040_stamp.pid.3=0xe182
-solderparty_rp2040_stamp.vid.4=0x1209
-solderparty_rp2040_stamp.pid.4=0xa182
-solderparty_rp2040_stamp.vid.5=0x1209
-solderparty_rp2040_stamp.pid.5=0xa182
-solderparty_rp2040_stamp.vid.6=0x1209
-solderparty_rp2040_stamp.pid.6=0xe182
-solderparty_rp2040_stamp.vid.7=0x1209
-solderparty_rp2040_stamp.pid.7=0xe182
+solderparty_rp2040_stamp.pid.1=0xe182
+solderparty_rp2040_stamp.upload_port.0.vid=0x1209
+solderparty_rp2040_stamp.upload_port.0.pid=0xa182
+solderparty_rp2040_stamp.upload_port.1.vid=0x1209
+solderparty_rp2040_stamp.upload_port.1.pid=0xe182
 solderparty_rp2040_stamp.build.usbvid=-DUSBD_VID=0x1209
 solderparty_rp2040_stamp.build.usbpid=-DUSBD_PID=0xa182
 solderparty_rp2040_stamp.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -14196,6 +14564,22 @@ sparkfun_micromodrp2040.vid.6=0x1b4f
 sparkfun_micromodrp2040.pid.6=0xc026
 sparkfun_micromodrp2040.vid.7=0x1b4f
 sparkfun_micromodrp2040.pid.7=0xc126
+sparkfun_micromodrp2040.upload_port.0.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.0.pid=0x0026
+sparkfun_micromodrp2040.upload_port.1.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.1.pid=0x0126
+sparkfun_micromodrp2040.upload_port.2.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.2.pid=0x4026
+sparkfun_micromodrp2040.upload_port.3.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.3.pid=0x4126
+sparkfun_micromodrp2040.upload_port.4.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.4.pid=0x8026
+sparkfun_micromodrp2040.upload_port.5.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.5.pid=0x8126
+sparkfun_micromodrp2040.upload_port.6.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.6.pid=0xc026
+sparkfun_micromodrp2040.upload_port.7.vid=0x1b4f
+sparkfun_micromodrp2040.upload_port.7.pid=0xc126
 sparkfun_micromodrp2040.build.usbvid=-DUSBD_VID=0x1b4f
 sparkfun_micromodrp2040.build.usbpid=-DUSBD_PID=0x0026
 sparkfun_micromodrp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -14498,6 +14882,22 @@ sparkfun_promicrorp2040.vid.6=0x1b4f
 sparkfun_promicrorp2040.pid.6=0xc026
 sparkfun_promicrorp2040.vid.7=0x1b4f
 sparkfun_promicrorp2040.pid.7=0xc126
+sparkfun_promicrorp2040.upload_port.0.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.0.pid=0x0026
+sparkfun_promicrorp2040.upload_port.1.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.1.pid=0x0126
+sparkfun_promicrorp2040.upload_port.2.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.2.pid=0x4026
+sparkfun_promicrorp2040.upload_port.3.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.3.pid=0x4126
+sparkfun_promicrorp2040.upload_port.4.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.4.pid=0x8026
+sparkfun_promicrorp2040.upload_port.5.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.5.pid=0x8126
+sparkfun_promicrorp2040.upload_port.6.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.6.pid=0xc026
+sparkfun_promicrorp2040.upload_port.7.vid=0x1b4f
+sparkfun_promicrorp2040.upload_port.7.pid=0xc126
 sparkfun_promicrorp2040.build.usbvid=-DUSBD_VID=0x1b4f
 sparkfun_promicrorp2040.build.usbpid=-DUSBD_PID=0x0026
 sparkfun_promicrorp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -14800,6 +15200,22 @@ sparkfun_thingplusrp2040.vid.6=0x1b4f
 sparkfun_thingplusrp2040.pid.6=0xc026
 sparkfun_thingplusrp2040.vid.7=0x1b4f
 sparkfun_thingplusrp2040.pid.7=0xc126
+sparkfun_thingplusrp2040.upload_port.0.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.0.pid=0x0026
+sparkfun_thingplusrp2040.upload_port.1.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.1.pid=0x0126
+sparkfun_thingplusrp2040.upload_port.2.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.2.pid=0x4026
+sparkfun_thingplusrp2040.upload_port.3.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.3.pid=0x4126
+sparkfun_thingplusrp2040.upload_port.4.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.4.pid=0x8026
+sparkfun_thingplusrp2040.upload_port.5.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.5.pid=0x8126
+sparkfun_thingplusrp2040.upload_port.6.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.6.pid=0xc026
+sparkfun_thingplusrp2040.upload_port.7.vid=0x1b4f
+sparkfun_thingplusrp2040.upload_port.7.pid=0xc126
 sparkfun_thingplusrp2040.build.usbvid=-DUSBD_VID=0x1b4f
 sparkfun_thingplusrp2040.build.usbpid=-DUSBD_PID=0x0026
 sparkfun_thingplusrp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -15102,6 +15518,22 @@ upesy_rp2040_devkit.vid.6=0x2e8a
 upesy_rp2040_devkit.pid.6=0xd007
 upesy_rp2040_devkit.vid.7=0x2e8a
 upesy_rp2040_devkit.pid.7=0xd107
+upesy_rp2040_devkit.upload_port.0.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.0.pid=0x1007
+upesy_rp2040_devkit.upload_port.1.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.1.pid=0x1107
+upesy_rp2040_devkit.upload_port.2.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.2.pid=0x5007
+upesy_rp2040_devkit.upload_port.3.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.3.pid=0x5107
+upesy_rp2040_devkit.upload_port.4.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.4.pid=0x9007
+upesy_rp2040_devkit.upload_port.5.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.5.pid=0x9107
+upesy_rp2040_devkit.upload_port.6.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.6.pid=0xd007
+upesy_rp2040_devkit.upload_port.7.vid=0x2e8a
+upesy_rp2040_devkit.upload_port.7.pid=0xd107
 upesy_rp2040_devkit.build.usbvid=-DUSBD_VID=0x2e8a
 upesy_rp2040_devkit.build.usbpid=-DUSBD_PID=0x1007
 upesy_rp2040_devkit.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -15306,6 +15738,22 @@ seeed_indicator_rp2040.vid.6=0x2886
 seeed_indicator_rp2040.pid.6=0xc050
 seeed_indicator_rp2040.vid.7=0x2886
 seeed_indicator_rp2040.pid.7=0xc150
+seeed_indicator_rp2040.upload_port.0.vid=0x2886
+seeed_indicator_rp2040.upload_port.0.pid=0x0050
+seeed_indicator_rp2040.upload_port.1.vid=0x2886
+seeed_indicator_rp2040.upload_port.1.pid=0x0150
+seeed_indicator_rp2040.upload_port.2.vid=0x2886
+seeed_indicator_rp2040.upload_port.2.pid=0x4050
+seeed_indicator_rp2040.upload_port.3.vid=0x2886
+seeed_indicator_rp2040.upload_port.3.pid=0x4150
+seeed_indicator_rp2040.upload_port.4.vid=0x2886
+seeed_indicator_rp2040.upload_port.4.pid=0x8050
+seeed_indicator_rp2040.upload_port.5.vid=0x2886
+seeed_indicator_rp2040.upload_port.5.pid=0x8150
+seeed_indicator_rp2040.upload_port.6.vid=0x2886
+seeed_indicator_rp2040.upload_port.6.pid=0xc050
+seeed_indicator_rp2040.upload_port.7.vid=0x2886
+seeed_indicator_rp2040.upload_port.7.pid=0xc150
 seeed_indicator_rp2040.build.usbvid=-DUSBD_VID=0x2886
 seeed_indicator_rp2040.build.usbpid=-DUSBD_PID=0x0050
 seeed_indicator_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -15510,6 +15958,22 @@ seeed_xiao_rp2040.vid.6=0x2e8a
 seeed_xiao_rp2040.pid.6=0xc00a
 seeed_xiao_rp2040.vid.7=0x2e8a
 seeed_xiao_rp2040.pid.7=0xc10a
+seeed_xiao_rp2040.upload_port.0.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.0.pid=0x000a
+seeed_xiao_rp2040.upload_port.1.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.1.pid=0x010a
+seeed_xiao_rp2040.upload_port.2.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.2.pid=0x400a
+seeed_xiao_rp2040.upload_port.3.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.3.pid=0x410a
+seeed_xiao_rp2040.upload_port.4.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.4.pid=0x800a
+seeed_xiao_rp2040.upload_port.5.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.5.pid=0x810a
+seeed_xiao_rp2040.upload_port.6.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.6.pid=0xc00a
+seeed_xiao_rp2040.upload_port.7.vid=0x2e8a
+seeed_xiao_rp2040.upload_port.7.pid=0xc10a
 seeed_xiao_rp2040.build.usbvid=-DUSBD_VID=0x2e8a
 seeed_xiao_rp2040.build.usbpid=-DUSBD_PID=0x000a
 seeed_xiao_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -15706,14 +16170,14 @@ vccgnd_yd_rp2040.vid.2=0x2e8a
 vccgnd_yd_rp2040.pid.2=0xc00a
 vccgnd_yd_rp2040.vid.3=0x2e8a
 vccgnd_yd_rp2040.pid.3=0xc10a
-vccgnd_yd_rp2040.vid.4=0x2e8a
-vccgnd_yd_rp2040.pid.4=0x800a
-vccgnd_yd_rp2040.vid.5=0x2e8a
-vccgnd_yd_rp2040.pid.5=0x810a
-vccgnd_yd_rp2040.vid.6=0x2e8a
-vccgnd_yd_rp2040.pid.6=0xc00a
-vccgnd_yd_rp2040.vid.7=0x2e8a
-vccgnd_yd_rp2040.pid.7=0xc10a
+vccgnd_yd_rp2040.upload_port.0.vid=0x2e8a
+vccgnd_yd_rp2040.upload_port.0.pid=0x800a
+vccgnd_yd_rp2040.upload_port.1.vid=0x2e8a
+vccgnd_yd_rp2040.upload_port.1.pid=0x810a
+vccgnd_yd_rp2040.upload_port.2.vid=0x2e8a
+vccgnd_yd_rp2040.upload_port.2.pid=0xc00a
+vccgnd_yd_rp2040.upload_port.3.vid=0x2e8a
+vccgnd_yd_rp2040.upload_port.3.pid=0xc10a
 vccgnd_yd_rp2040.build.usbvid=-DUSBD_VID=0x2e8a
 vccgnd_yd_rp2040.build.usbpid=-DUSBD_PID=0x800a
 vccgnd_yd_rp2040.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -15988,6 +16452,22 @@ viyalab_mizu.vid.6=0x2e8a
 viyalab_mizu.pid.6=0xc00a
 viyalab_mizu.vid.7=0x2e8a
 viyalab_mizu.pid.7=0xc10a
+viyalab_mizu.upload_port.0.vid=0x2e8a
+viyalab_mizu.upload_port.0.pid=0x000a
+viyalab_mizu.upload_port.1.vid=0x2e8a
+viyalab_mizu.upload_port.1.pid=0x010a
+viyalab_mizu.upload_port.2.vid=0x2e8a
+viyalab_mizu.upload_port.2.pid=0x400a
+viyalab_mizu.upload_port.3.vid=0x2e8a
+viyalab_mizu.upload_port.3.pid=0x410a
+viyalab_mizu.upload_port.4.vid=0x2e8a
+viyalab_mizu.upload_port.4.pid=0x800a
+viyalab_mizu.upload_port.5.vid=0x2e8a
+viyalab_mizu.upload_port.5.pid=0x810a
+viyalab_mizu.upload_port.6.vid=0x2e8a
+viyalab_mizu.upload_port.6.pid=0xc00a
+viyalab_mizu.upload_port.7.vid=0x2e8a
+viyalab_mizu.upload_port.7.pid=0xc10a
 viyalab_mizu.build.usbvid=-DUSBD_VID=0x2e8a
 viyalab_mizu.build.usbpid=-DUSBD_PID=0x000a
 viyalab_mizu.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -16234,6 +16714,22 @@ waveshare_rp2040_zero.vid.6=0x2e8a
 waveshare_rp2040_zero.pid.6=0xc003
 waveshare_rp2040_zero.vid.7=0x2e8a
 waveshare_rp2040_zero.pid.7=0xc103
+waveshare_rp2040_zero.upload_port.0.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.0.pid=0x0003
+waveshare_rp2040_zero.upload_port.1.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.1.pid=0x0103
+waveshare_rp2040_zero.upload_port.2.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.2.pid=0x4003
+waveshare_rp2040_zero.upload_port.3.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.3.pid=0x4103
+waveshare_rp2040_zero.upload_port.4.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.4.pid=0x8003
+waveshare_rp2040_zero.upload_port.5.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.5.pid=0x8103
+waveshare_rp2040_zero.upload_port.6.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.6.pid=0xc003
+waveshare_rp2040_zero.upload_port.7.vid=0x2e8a
+waveshare_rp2040_zero.upload_port.7.pid=0xc103
 waveshare_rp2040_zero.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_zero.build.usbpid=-DUSBD_PID=0x0003
 waveshare_rp2040_zero.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -16438,6 +16934,22 @@ waveshare_rp2040_one.vid.6=0x2e8a
 waveshare_rp2040_one.pid.6=0xd03a
 waveshare_rp2040_one.vid.7=0x2e8a
 waveshare_rp2040_one.pid.7=0xd13a
+waveshare_rp2040_one.upload_port.0.vid=0x2e8a
+waveshare_rp2040_one.upload_port.0.pid=0x103a
+waveshare_rp2040_one.upload_port.1.vid=0x2e8a
+waveshare_rp2040_one.upload_port.1.pid=0x113a
+waveshare_rp2040_one.upload_port.2.vid=0x2e8a
+waveshare_rp2040_one.upload_port.2.pid=0x503a
+waveshare_rp2040_one.upload_port.3.vid=0x2e8a
+waveshare_rp2040_one.upload_port.3.pid=0x513a
+waveshare_rp2040_one.upload_port.4.vid=0x2e8a
+waveshare_rp2040_one.upload_port.4.pid=0x903a
+waveshare_rp2040_one.upload_port.5.vid=0x2e8a
+waveshare_rp2040_one.upload_port.5.pid=0x913a
+waveshare_rp2040_one.upload_port.6.vid=0x2e8a
+waveshare_rp2040_one.upload_port.6.pid=0xd03a
+waveshare_rp2040_one.upload_port.7.vid=0x2e8a
+waveshare_rp2040_one.upload_port.7.pid=0xd13a
 waveshare_rp2040_one.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_one.build.usbpid=-DUSBD_PID=0x103a
 waveshare_rp2040_one.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -16656,6 +17168,22 @@ waveshare_rp2040_matrix.vid.6=0x2e8a
 waveshare_rp2040_matrix.pid.6=0xd03a
 waveshare_rp2040_matrix.vid.7=0x2e8a
 waveshare_rp2040_matrix.pid.7=0xd13a
+waveshare_rp2040_matrix.upload_port.0.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.0.pid=0x103a
+waveshare_rp2040_matrix.upload_port.1.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.1.pid=0x113a
+waveshare_rp2040_matrix.upload_port.2.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.2.pid=0x503a
+waveshare_rp2040_matrix.upload_port.3.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.3.pid=0x513a
+waveshare_rp2040_matrix.upload_port.4.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.4.pid=0x903a
+waveshare_rp2040_matrix.upload_port.5.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.5.pid=0x913a
+waveshare_rp2040_matrix.upload_port.6.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.6.pid=0xd03a
+waveshare_rp2040_matrix.upload_port.7.vid=0x2e8a
+waveshare_rp2040_matrix.upload_port.7.pid=0xd13a
 waveshare_rp2040_matrix.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_matrix.build.usbpid=-DUSBD_PID=0x103a
 waveshare_rp2040_matrix.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -16860,6 +17388,22 @@ waveshare_rp2040_pizero.vid.6=0x2e8a
 waveshare_rp2040_pizero.pid.6=0xc003
 waveshare_rp2040_pizero.vid.7=0x2e8a
 waveshare_rp2040_pizero.pid.7=0xc103
+waveshare_rp2040_pizero.upload_port.0.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.0.pid=0x0003
+waveshare_rp2040_pizero.upload_port.1.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.1.pid=0x0103
+waveshare_rp2040_pizero.upload_port.2.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.2.pid=0x4003
+waveshare_rp2040_pizero.upload_port.3.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.3.pid=0x4103
+waveshare_rp2040_pizero.upload_port.4.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.4.pid=0x8003
+waveshare_rp2040_pizero.upload_port.5.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.5.pid=0x8103
+waveshare_rp2040_pizero.upload_port.6.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.6.pid=0xc003
+waveshare_rp2040_pizero.upload_port.7.vid=0x2e8a
+waveshare_rp2040_pizero.upload_port.7.pid=0xc103
 waveshare_rp2040_pizero.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_pizero.build.usbpid=-DUSBD_PID=0x0003
 waveshare_rp2040_pizero.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -17162,6 +17706,22 @@ waveshare_rp2040_plus_4mb.vid.6=0x2e8a
 waveshare_rp2040_plus_4mb.pid.6=0xd020
 waveshare_rp2040_plus_4mb.vid.7=0x2e8a
 waveshare_rp2040_plus_4mb.pid.7=0xd120
+waveshare_rp2040_plus_4mb.upload_port.0.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.0.pid=0x1020
+waveshare_rp2040_plus_4mb.upload_port.1.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.1.pid=0x1120
+waveshare_rp2040_plus_4mb.upload_port.2.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.2.pid=0x5020
+waveshare_rp2040_plus_4mb.upload_port.3.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.3.pid=0x5120
+waveshare_rp2040_plus_4mb.upload_port.4.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.4.pid=0x9020
+waveshare_rp2040_plus_4mb.upload_port.5.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.5.pid=0x9120
+waveshare_rp2040_plus_4mb.upload_port.6.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.6.pid=0xd020
+waveshare_rp2040_plus_4mb.upload_port.7.vid=0x2e8a
+waveshare_rp2040_plus_4mb.upload_port.7.pid=0xd120
 waveshare_rp2040_plus_4mb.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_plus_4mb.build.usbpid=-DUSBD_PID=0x1020
 waveshare_rp2040_plus_4mb.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -17380,6 +17940,22 @@ waveshare_rp2040_plus_16mb.vid.6=0x2e8a
 waveshare_rp2040_plus_16mb.pid.6=0xd020
 waveshare_rp2040_plus_16mb.vid.7=0x2e8a
 waveshare_rp2040_plus_16mb.pid.7=0xd120
+waveshare_rp2040_plus_16mb.upload_port.0.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.0.pid=0x1020
+waveshare_rp2040_plus_16mb.upload_port.1.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.1.pid=0x1120
+waveshare_rp2040_plus_16mb.upload_port.2.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.2.pid=0x5020
+waveshare_rp2040_plus_16mb.upload_port.3.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.3.pid=0x5120
+waveshare_rp2040_plus_16mb.upload_port.4.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.4.pid=0x9020
+waveshare_rp2040_plus_16mb.upload_port.5.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.5.pid=0x9120
+waveshare_rp2040_plus_16mb.upload_port.6.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.6.pid=0xd020
+waveshare_rp2040_plus_16mb.upload_port.7.vid=0x2e8a
+waveshare_rp2040_plus_16mb.upload_port.7.pid=0xd120
 waveshare_rp2040_plus_16mb.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_plus_16mb.build.usbpid=-DUSBD_PID=0x1020
 waveshare_rp2040_plus_16mb.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -17682,6 +18258,22 @@ waveshare_rp2040_lcd_0_96.vid.6=0x2e8a
 waveshare_rp2040_lcd_0_96.pid.6=0xd021
 waveshare_rp2040_lcd_0_96.vid.7=0x2e8a
 waveshare_rp2040_lcd_0_96.pid.7=0xd121
+waveshare_rp2040_lcd_0_96.upload_port.0.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.0.pid=0x1021
+waveshare_rp2040_lcd_0_96.upload_port.1.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.1.pid=0x1121
+waveshare_rp2040_lcd_0_96.upload_port.2.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.2.pid=0x5021
+waveshare_rp2040_lcd_0_96.upload_port.3.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.3.pid=0x5121
+waveshare_rp2040_lcd_0_96.upload_port.4.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.4.pid=0x9021
+waveshare_rp2040_lcd_0_96.upload_port.5.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.5.pid=0x9121
+waveshare_rp2040_lcd_0_96.upload_port.6.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.6.pid=0xd021
+waveshare_rp2040_lcd_0_96.upload_port.7.vid=0x2e8a
+waveshare_rp2040_lcd_0_96.upload_port.7.pid=0xd121
 waveshare_rp2040_lcd_0_96.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_lcd_0_96.build.usbpid=-DUSBD_PID=0x1021
 waveshare_rp2040_lcd_0_96.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -17886,6 +18478,22 @@ waveshare_rp2040_lcd_1_28.vid.6=0x2e8a
 waveshare_rp2040_lcd_1_28.pid.6=0xd039
 waveshare_rp2040_lcd_1_28.vid.7=0x2e8a
 waveshare_rp2040_lcd_1_28.pid.7=0xd139
+waveshare_rp2040_lcd_1_28.upload_port.0.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.0.pid=0x1039
+waveshare_rp2040_lcd_1_28.upload_port.1.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.1.pid=0x1139
+waveshare_rp2040_lcd_1_28.upload_port.2.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.2.pid=0x5039
+waveshare_rp2040_lcd_1_28.upload_port.3.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.3.pid=0x5139
+waveshare_rp2040_lcd_1_28.upload_port.4.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.4.pid=0x9039
+waveshare_rp2040_lcd_1_28.upload_port.5.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.5.pid=0x9139
+waveshare_rp2040_lcd_1_28.upload_port.6.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.6.pid=0xd039
+waveshare_rp2040_lcd_1_28.upload_port.7.vid=0x2e8a
+waveshare_rp2040_lcd_1_28.upload_port.7.pid=0xd139
 waveshare_rp2040_lcd_1_28.build.usbvid=-DUSBD_VID=0x2e8a
 waveshare_rp2040_lcd_1_28.build.usbpid=-DUSBD_PID=0x1039
 waveshare_rp2040_lcd_1_28.build.usbpwr=-DUSBD_MAX_POWER_MA=500
@@ -18090,6 +18698,22 @@ wiznet_5100s_evb_pico.vid.6=0x2e8a
 wiznet_5100s_evb_pico.pid.6=0xd027
 wiznet_5100s_evb_pico.vid.7=0x2e8a
 wiznet_5100s_evb_pico.pid.7=0xd127
+wiznet_5100s_evb_pico.upload_port.0.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.0.pid=0x1027
+wiznet_5100s_evb_pico.upload_port.1.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.1.pid=0x1127
+wiznet_5100s_evb_pico.upload_port.2.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.2.pid=0x5027
+wiznet_5100s_evb_pico.upload_port.3.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.3.pid=0x5127
+wiznet_5100s_evb_pico.upload_port.4.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.4.pid=0x9027
+wiznet_5100s_evb_pico.upload_port.5.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.5.pid=0x9127
+wiznet_5100s_evb_pico.upload_port.6.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.6.pid=0xd027
+wiznet_5100s_evb_pico.upload_port.7.vid=0x2e8a
+wiznet_5100s_evb_pico.upload_port.7.pid=0xd127
 wiznet_5100s_evb_pico.build.usbvid=-DUSBD_VID=0x2e8a
 wiznet_5100s_evb_pico.build.usbpid=-DUSBD_PID=0x1027
 wiznet_5100s_evb_pico.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -18294,6 +18918,22 @@ wiznet_wizfi360_evb_pico.vid.6=0x2e8a
 wiznet_wizfi360_evb_pico.pid.6=0xd028
 wiznet_wizfi360_evb_pico.vid.7=0x2e8a
 wiznet_wizfi360_evb_pico.pid.7=0xd128
+wiznet_wizfi360_evb_pico.upload_port.0.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.0.pid=0x1028
+wiznet_wizfi360_evb_pico.upload_port.1.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.1.pid=0x1128
+wiznet_wizfi360_evb_pico.upload_port.2.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.2.pid=0x5028
+wiznet_wizfi360_evb_pico.upload_port.3.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.3.pid=0x5128
+wiznet_wizfi360_evb_pico.upload_port.4.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.4.pid=0x9028
+wiznet_wizfi360_evb_pico.upload_port.5.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.5.pid=0x9128
+wiznet_wizfi360_evb_pico.upload_port.6.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.6.pid=0xd028
+wiznet_wizfi360_evb_pico.upload_port.7.vid=0x2e8a
+wiznet_wizfi360_evb_pico.upload_port.7.pid=0xd128
 wiznet_wizfi360_evb_pico.build.usbvid=-DUSBD_VID=0x2e8a
 wiznet_wizfi360_evb_pico.build.usbpid=-DUSBD_PID=0x1028
 wiznet_wizfi360_evb_pico.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -18498,6 +19138,22 @@ wiznet_5500_evb_pico.vid.6=0x2e8a
 wiznet_5500_evb_pico.pid.6=0xd029
 wiznet_5500_evb_pico.vid.7=0x2e8a
 wiznet_5500_evb_pico.pid.7=0xd129
+wiznet_5500_evb_pico.upload_port.0.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.0.pid=0x1029
+wiznet_5500_evb_pico.upload_port.1.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.1.pid=0x1129
+wiznet_5500_evb_pico.upload_port.2.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.2.pid=0x5029
+wiznet_5500_evb_pico.upload_port.3.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.3.pid=0x5129
+wiznet_5500_evb_pico.upload_port.4.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.4.pid=0x9029
+wiznet_5500_evb_pico.upload_port.5.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.5.pid=0x9129
+wiznet_5500_evb_pico.upload_port.6.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.6.pid=0xd029
+wiznet_5500_evb_pico.upload_port.7.vid=0x2e8a
+wiznet_5500_evb_pico.upload_port.7.pid=0xd129
 wiznet_5500_evb_pico.build.usbvid=-DUSBD_VID=0x2e8a
 wiznet_5500_evb_pico.build.usbpid=-DUSBD_PID=0x1029
 wiznet_5500_evb_pico.build.usbpwr=-DUSBD_MAX_POWER_MA=250
@@ -18690,18 +19346,10 @@ generic.vid.0=0x2e8a
 generic.pid.0=0xf00a
 generic.vid.1=0x2e8a
 generic.pid.1=0xf10a
-generic.vid.2=0x2e8a
-generic.pid.2=0xf00a
-generic.vid.3=0x2e8a
-generic.pid.3=0xf10a
-generic.vid.4=0x2e8a
-generic.pid.4=0xf00a
-generic.vid.5=0x2e8a
-generic.pid.5=0xf10a
-generic.vid.6=0x2e8a
-generic.pid.6=0xf00a
-generic.vid.7=0x2e8a
-generic.pid.7=0xf10a
+generic.upload_port.0.vid=0x2e8a
+generic.upload_port.0.pid=0xf00a
+generic.upload_port.1.vid=0x2e8a
+generic.upload_port.1.pid=0xf10a
 generic.build.usbvid=-DUSBD_VID=0x2e8a
 generic.build.usbpid=-DUSBD_PID=0xf00a
 generic.build.usbpwr=-DUSBD_MAX_POWER_MA=250

tools/makeboards.py

@@ -144,25 +144,42 @@ def BuildHeader(name, vendor_name, product_name, vid, pid, pwr, boarddefine, var
     print("# %s" % (prettyname))
     print("# -----------------------------------")
     print("%s.name=%s" % (name, prettyname))
-    usb = 0
-    if type(pid) == list:
-        for tp in pid:
-            print("%s.vid.%d=%s" % (name, usb, vid))
-            print("%s.pid.%d=0x%04x" % (name, usb, int(tp, 16)))
-            usb = usb + 1
+
+    # USB Vendor ID / Product ID (VID/PID) pairs for board detection
+    if isinstance(pid, list):
+        # Explicitly specified list of PIDs (with the same VID)
+        usb_pids = pid
     else:
-        for kb in [ "0", "0x8000" ]:
-            for ms in [ "0", "0x4000" ]:
-                for jy in [ "0", "0x0100" ]:
-                    thispid = int(pid, 16) | int(kb, 16) | int(ms, 16) | int(jy, 16)
-                    print("%s.vid.%d=%s" % (name, usb, vid))
-                    print("%s.pid.%d=0x%04x" % (name, usb, thispid))
-                    usb = usb + 1
+        # When the RP2040 is used as a composite device, the PID is modified
+        # (see cores/rp2040/RP2040USB.cpp) because Windows wants a different
+        # VID:PID for different device configurations [citation needed?].
+        # See https://github.com/earlephilhower/arduino-pico/issues/796
+        #
+        # TODO FIX: Some PIDs already have these bits set, and there's no
+        # guarantee mangling PIDs this way won't collide with other devices.
+        usb_pids = []
+        for k_bit in [0, 0x8000]:
+            for m_bit in [0, 0x4000]:
+                for j_bit in [0, 0x0100]:
+                    this_pid = "0x%04x" % (int(pid, 16) | k_bit | m_bit | j_bit)
+                    if this_pid not in usb_pids:
+                        usb_pids.append(this_pid)
+
+    main_pid = usb_pids[0]
+
+    # Old style VID/PID list for compatibility with older Arduino tools
+    for i, pid in enumerate(usb_pids):
+        print("%s.vid.%d=%s" % (name, i, vid))
+        print("%s.pid.%d=%s" % (name, i, pid))
+
+    # Since our platform.txt enables pluggable discovery, we are also required
+    # to list VID/PID in this format
+    for i, pid in enumerate(usb_pids):
+        print("%s.upload_port.%d.vid=%s" % (name, i, vid))
+        print("%s.upload_port.%d.pid=%s" % (name, i, pid))
+
     print("%s.build.usbvid=-DUSBD_VID=%s" % (name, vid))
-    if type(pid) == list:
-        print("%s.build.usbpid=-DUSBD_PID=%s" % (name, pid[0]))
-    else:
-        print("%s.build.usbpid=-DUSBD_PID=%s" % (name, pid))
+    print("%s.build.usbpid=-DUSBD_PID=%s" % (name, main_pid))
     print("%s.build.usbpwr=-DUSBD_MAX_POWER_MA=%s" % (name, pwr))
     print("%s.build.board=%s" % (name, boarddefine))
     print("%s.build.mcu=cortex-m0plus" % (name))
@@ -245,7 +262,8 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flash
     pkgjson['packages'][0]['platforms'][0]['boards'].append(thisbrd)
 
 def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flashsizemb, boot2, extra, board_url):
-    if type(pid) == list:
+    # TODO FIX: Use the same expanded PID list as in BuildHeader above?
+    if isinstance(pid, list):
         pid = pid[0]
     if extra != None:
         m_extra = ' '