diff --git a/boards.txt b/boards.txt
index 1d1540dc783..9bb827e6313 100644
--- a/boards.txt
+++ b/boards.txt
@@ -4376,167 +4376,174 @@ adafruit_funhouse_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
-adafruit_feather_esp32s2_nopsram.name=Adafruit Feather ESP32-S2
-adafruit_feather_esp32s2_nopsram.vid.0=0x239A
-adafruit_feather_esp32s2_nopsram.pid.0=0x80EB
-adafruit_feather_esp32s2_nopsram.vid.1=0x239A
-adafruit_feather_esp32s2_nopsram.pid.1=0x00EB
-adafruit_feather_esp32s2_nopsram.vid.1=0x239A
-adafruit_feather_esp32s2_nopsram.pid.1=0x80EC
-
-adafruit_feather_esp32s2_nopsram.upload.tool=esptool_py
-adafruit_feather_esp32s2_nopsram.upload.maximum_size=1310720
-adafruit_feather_esp32s2_nopsram.upload.maximum_data_size=327680
-adafruit_feather_esp32s2_nopsram.upload.flags=
-adafruit_feather_esp32s2_nopsram.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
-adafruit_feather_esp32s2_nopsram.upload.use_1200bps_touch=true
-adafruit_feather_esp32s2_nopsram.upload.wait_for_upload_port=true
-
-adafruit_feather_esp32s2_nopsram.serial.disableDTR=false
-adafruit_feather_esp32s2_nopsram.serial.disableRTS=false
-
-adafruit_feather_esp32s2_nopsram.build.tarch=xtensa
-adafruit_feather_esp32s2_nopsram.build.bootloader_addr=0x1000
-adafruit_feather_esp32s2_nopsram.build.target=esp32s2
-adafruit_feather_esp32s2_nopsram.build.mcu=esp32s2
-adafruit_feather_esp32s2_nopsram.build.core=esp32
-adafruit_feather_esp32s2_nopsram.build.variant=adafruit_feather_esp32s2
-adafruit_feather_esp32s2_nopsram.build.board=ADAFRUIT_FEATHER_ESP32S2
-
-adafruit_feather_esp32s2_nopsram.build.cdc_on_boot=0
-adafruit_feather_esp32s2_nopsram.build.msc_on_boot=0
-adafruit_feather_esp32s2_nopsram.build.dfu_on_boot=0
-adafruit_feather_esp32s2_nopsram.build.f_cpu=240000000L
-adafruit_feather_esp32s2_nopsram.build.flash_size=4MB
-adafruit_feather_esp32s2_nopsram.build.flash_freq=80m
-adafruit_feather_esp32s2_nopsram.build.flash_mode=qio
-adafruit_feather_esp32s2_nopsram.build.boot=qio
-adafruit_feather_esp32s2_nopsram.build.partitions=default
-adafruit_feather_esp32s2_nopsram.build.defines=
-
-adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.cdc=Enabled
-adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
-adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.default=Disabled
-adafruit_feather_esp32s2_nopsram.menu.CDCOnBoot.default.build.cdc_on_boot=0
-
-adafruit_feather_esp32s2_nopsram.menu.MSCOnBoot.default=Disabled
-adafruit_feather_esp32s2_nopsram.menu.MSCOnBoot.default.build.msc_on_boot=0
-adafruit_feather_esp32s2_nopsram.menu.MSCOnBoot.msc=Enabled
-adafruit_feather_esp32s2_nopsram.menu.MSCOnBoot.msc.build.msc_on_boot=1
-
-adafruit_feather_esp32s2_nopsram.menu.DFUOnBoot.default=Disabled
-adafruit_feather_esp32s2_nopsram.menu.DFUOnBoot.default.build.dfu_on_boot=0
-adafruit_feather_esp32s2_nopsram.menu.DFUOnBoot.dfu=Enabled
-adafruit_feather_esp32s2_nopsram.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
-
-adafruit_feather_esp32s2_nopsram.menu.PSRAM.enabled=Enabled
-adafruit_feather_esp32s2_nopsram.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
-adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled=Disabled
-adafruit_feather_esp32s2_nopsram.menu.PSRAM.disabled.build.defines=
-
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default.build.partitions=default
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.minimal.build.partitions=minimal
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.no_ota.build.partitions=no_ota
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.huge_app.build.partitions=huge_app
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.fatflash.build.partitions=ffat
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
-adafruit_feather_esp32s2_nopsram.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
-
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.240=240MHz (WiFi)
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.240.build.f_cpu=240000000L
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.160=160MHz (WiFi)
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.160.build.f_cpu=160000000L
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.80=80MHz (WiFi)
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.80.build.f_cpu=80000000L
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.40=40MHz
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.40.build.f_cpu=40000000L
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.20=20MHz
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.20.build.f_cpu=20000000L
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.10=10MHz
-adafruit_feather_esp32s2_nopsram.menu.CPUFreq.10.build.f_cpu=10000000L
-
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.qio=QIO
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.qio.build.flash_mode=dio
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.qio.build.boot=qio
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.dio=DIO
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.dio.build.flash_mode=dio
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.dio.build.boot=dio
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.qout=QOUT
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.qout.build.flash_mode=dout
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.qout.build.boot=qout
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.dout=DOUT
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.dout.build.flash_mode=dout
-adafruit_feather_esp32s2_nopsram.menu.FlashMode.dout.build.boot=dout
-
-adafruit_feather_esp32s2_nopsram.menu.FlashFreq.80=80MHz
-adafruit_feather_esp32s2_nopsram.menu.FlashFreq.80.build.flash_freq=80m
-adafruit_feather_esp32s2_nopsram.menu.FlashFreq.40=40MHz
-adafruit_feather_esp32s2_nopsram.menu.FlashFreq.40.build.flash_freq=40m
-
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.4M=4MB (32Mb)
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.4M.build.flash_size=4MB
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.8M=8MB (64Mb)
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.8M.build.flash_size=8MB
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.8M.build.partitions=default_8MB
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.2M=2MB (16Mb)
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.2M.build.flash_size=2MB
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.2M.build.partitions=minimal
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.16M=16MB (128Mb)
-adafruit_feather_esp32s2_nopsram.menu.FlashSize.16M.build.flash_size=16MB
-
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.921600=921600
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.921600.upload.speed=921600
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.115200=115200
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.115200.upload.speed=115200
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.256000.windows=256000
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.256000.upload.speed=256000
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.230400.windows.upload.speed=256000
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.230400=230400
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.230400.upload.speed=230400
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.460800.linux=460800
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.460800.macosx=460800
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.460800.upload.speed=460800
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.512000.windows=512000
-adafruit_feather_esp32s2_nopsram.menu.UploadSpeed.512000.upload.speed=512000
-
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.none=None
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.none.build.code_debug=0
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.error=Error
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.error.build.code_debug=1
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.warn=Warn
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.warn.build.code_debug=2
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.info=Info
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.info.build.code_debug=3
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.debug=Debug
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.debug.build.code_debug=4
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.verbose=Verbose
-adafruit_feather_esp32s2_nopsram.menu.DebugLevel.verbose.build.code_debug=5
+adafruit_feather_esp32s2.name=Adafruit Feather ESP32-S2
+adafruit_feather_esp32s2.vid.0=0x239A
+adafruit_feather_esp32s2.pid.0=0x80EB
+adafruit_feather_esp32s2.vid.1=0x239A
+adafruit_feather_esp32s2.pid.1=0x00EB
+adafruit_feather_esp32s2.vid.1=0x239A
+adafruit_feather_esp32s2.pid.1=0x80EC
+
+adafruit_feather_esp32s2.upload.tool=esptool_py
+adafruit_feather_esp32s2.upload.maximum_size=1310720
+adafruit_feather_esp32s2.upload.maximum_data_size=327680
+adafruit_feather_esp32s2.upload.flags=
+adafruit_feather_esp32s2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s2.upload.use_1200bps_touch=true
+adafruit_feather_esp32s2.upload.wait_for_upload_port=true
+
+adafruit_feather_esp32s2.serial.disableDTR=false
+adafruit_feather_esp32s2.serial.disableRTS=false
+
+adafruit_feather_esp32s2.build.tarch=xtensa
+adafruit_feather_esp32s2.build.bootloader_addr=0x1000
+adafruit_feather_esp32s2.build.target=esp32s2
+adafruit_feather_esp32s2.build.mcu=esp32s2
+adafruit_feather_esp32s2.build.core=esp32
+adafruit_feather_esp32s2.build.variant=adafruit_feather_esp32s2
+adafruit_feather_esp32s2.build.board=ADAFRUIT_FEATHER_ESP32S2
+
+adafruit_feather_esp32s2.build.cdc_on_boot=1
+adafruit_feather_esp32s2.build.msc_on_boot=0
+adafruit_feather_esp32s2.build.dfu_on_boot=0
+adafruit_feather_esp32s2.build.f_cpu=240000000L
+adafruit_feather_esp32s2.build.flash_size=4MB
+adafruit_feather_esp32s2.build.flash_freq=80m
+adafruit_feather_esp32s2.build.flash_mode=qio
+adafruit_feather_esp32s2.build.boot=qio
+adafruit_feather_esp32s2.build.partitions=default
+adafruit_feather_esp32s2.build.defines=
+
+adafruit_feather_esp32s2.menu.CDCOnBoot.cdc=Enabled
+adafruit_feather_esp32s2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_feather_esp32s2.menu.CDCOnBoot.default=Disabled
+adafruit_feather_esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+adafruit_feather_esp32s2.menu.MSCOnBoot.default=Disabled
+adafruit_feather_esp32s2.menu.MSCOnBoot.default.build.msc_on_boot=0
+adafruit_feather_esp32s2.menu.MSCOnBoot.msc=Enabled
+adafruit_feather_esp32s2.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+adafruit_feather_esp32s2.menu.DFUOnBoot.default=Disabled
+adafruit_feather_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
+adafruit_feather_esp32s2.menu.DFUOnBoot.dfu=Enabled
+adafruit_feather_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+adafruit_feather_esp32s2.menu.UploadMode.cdc=Internal USB
+adafruit_feather_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+adafruit_feather_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+adafruit_feather_esp32s2.menu.UploadMode.default=UART0
+adafruit_feather_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
+adafruit_feather_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+adafruit_feather_esp32s2.menu.PSRAM.enabled=Enabled
+adafruit_feather_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+adafruit_feather_esp32s2.menu.PSRAM.disabled=Disabled
+adafruit_feather_esp32s2.menu.PSRAM.disabled.build.defines=
+
+adafruit_feather_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.default.build.partitions=default
+adafruit_feather_esp32s2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+adafruit_feather_esp32s2.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+adafruit_feather_esp32s2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+adafruit_feather_esp32s2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+adafruit_feather_esp32s2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.minimal.build.partitions=minimal
+adafruit_feather_esp32s2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.no_ota.build.partitions=no_ota
+adafruit_feather_esp32s2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+adafruit_feather_esp32s2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+adafruit_feather_esp32s2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.huge_app.build.partitions=huge_app
+adafruit_feather_esp32s2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+adafruit_feather_esp32s2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+adafruit_feather_esp32s2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+adafruit_feather_esp32s2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+adafruit_feather_esp32s2.menu.PartitionScheme.fatflash.build.partitions=ffat
+adafruit_feather_esp32s2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+adafruit_feather_esp32s2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+adafruit_feather_esp32s2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+
+adafruit_feather_esp32s2.menu.CPUFreq.240=240MHz (WiFi)
+adafruit_feather_esp32s2.menu.CPUFreq.240.build.f_cpu=240000000L
+adafruit_feather_esp32s2.menu.CPUFreq.160=160MHz (WiFi)
+adafruit_feather_esp32s2.menu.CPUFreq.160.build.f_cpu=160000000L
+adafruit_feather_esp32s2.menu.CPUFreq.80=80MHz (WiFi)
+adafruit_feather_esp32s2.menu.CPUFreq.80.build.f_cpu=80000000L
+adafruit_feather_esp32s2.menu.CPUFreq.40=40MHz
+adafruit_feather_esp32s2.menu.CPUFreq.40.build.f_cpu=40000000L
+adafruit_feather_esp32s2.menu.CPUFreq.20=20MHz
+adafruit_feather_esp32s2.menu.CPUFreq.20.build.f_cpu=20000000L
+adafruit_feather_esp32s2.menu.CPUFreq.10=10MHz
+adafruit_feather_esp32s2.menu.CPUFreq.10.build.f_cpu=10000000L
+
+adafruit_feather_esp32s2.menu.FlashMode.qio=QIO
+adafruit_feather_esp32s2.menu.FlashMode.qio.build.flash_mode=dio
+adafruit_feather_esp32s2.menu.FlashMode.qio.build.boot=qio
+adafruit_feather_esp32s2.menu.FlashMode.dio=DIO
+adafruit_feather_esp32s2.menu.FlashMode.dio.build.flash_mode=dio
+adafruit_feather_esp32s2.menu.FlashMode.dio.build.boot=dio
+adafruit_feather_esp32s2.menu.FlashMode.qout=QOUT
+adafruit_feather_esp32s2.menu.FlashMode.qout.build.flash_mode=dout
+adafruit_feather_esp32s2.menu.FlashMode.qout.build.boot=qout
+adafruit_feather_esp32s2.menu.FlashMode.dout=DOUT
+adafruit_feather_esp32s2.menu.FlashMode.dout.build.flash_mode=dout
+adafruit_feather_esp32s2.menu.FlashMode.dout.build.boot=dout
+
+adafruit_feather_esp32s2.menu.FlashFreq.80=80MHz
+adafruit_feather_esp32s2.menu.FlashFreq.80.build.flash_freq=80m
+adafruit_feather_esp32s2.menu.FlashFreq.40=40MHz
+adafruit_feather_esp32s2.menu.FlashFreq.40.build.flash_freq=40m
+
+adafruit_feather_esp32s2.menu.FlashSize.4M=4MB (32Mb)
+adafruit_feather_esp32s2.menu.FlashSize.4M.build.flash_size=4MB
+adafruit_feather_esp32s2.menu.FlashSize.8M=8MB (64Mb)
+adafruit_feather_esp32s2.menu.FlashSize.8M.build.flash_size=8MB
+adafruit_feather_esp32s2.menu.FlashSize.8M.build.partitions=default_8MB
+adafruit_feather_esp32s2.menu.FlashSize.2M=2MB (16Mb)
+adafruit_feather_esp32s2.menu.FlashSize.2M.build.flash_size=2MB
+adafruit_feather_esp32s2.menu.FlashSize.2M.build.partitions=minimal
+adafruit_feather_esp32s2.menu.FlashSize.16M=16MB (128Mb)
+adafruit_feather_esp32s2.menu.FlashSize.16M.build.flash_size=16MB
+
+adafruit_feather_esp32s2.menu.UploadSpeed.921600=921600
+adafruit_feather_esp32s2.menu.UploadSpeed.921600.upload.speed=921600
+adafruit_feather_esp32s2.menu.UploadSpeed.115200=115200
+adafruit_feather_esp32s2.menu.UploadSpeed.115200.upload.speed=115200
+adafruit_feather_esp32s2.menu.UploadSpeed.256000.windows=256000
+adafruit_feather_esp32s2.menu.UploadSpeed.256000.upload.speed=256000
+adafruit_feather_esp32s2.menu.UploadSpeed.230400.windows.upload.speed=256000
+adafruit_feather_esp32s2.menu.UploadSpeed.230400=230400
+adafruit_feather_esp32s2.menu.UploadSpeed.230400.upload.speed=230400
+adafruit_feather_esp32s2.menu.UploadSpeed.460800.linux=460800
+adafruit_feather_esp32s2.menu.UploadSpeed.460800.macosx=460800
+adafruit_feather_esp32s2.menu.UploadSpeed.460800.upload.speed=460800
+adafruit_feather_esp32s2.menu.UploadSpeed.512000.windows=512000
+adafruit_feather_esp32s2.menu.UploadSpeed.512000.upload.speed=512000
+
+adafruit_feather_esp32s2.menu.DebugLevel.none=None
+adafruit_feather_esp32s2.menu.DebugLevel.none.build.code_debug=0
+adafruit_feather_esp32s2.menu.DebugLevel.error=Error
+adafruit_feather_esp32s2.menu.DebugLevel.error.build.code_debug=1
+adafruit_feather_esp32s2.menu.DebugLevel.warn=Warn
+adafruit_feather_esp32s2.menu.DebugLevel.warn.build.code_debug=2
+adafruit_feather_esp32s2.menu.DebugLevel.info=Info
+adafruit_feather_esp32s2.menu.DebugLevel.info.build.code_debug=3
+adafruit_feather_esp32s2.menu.DebugLevel.debug=Debug
+adafruit_feather_esp32s2.menu.DebugLevel.debug.build.code_debug=4
+adafruit_feather_esp32s2.menu.DebugLevel.verbose=Verbose
+adafruit_feather_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
 
 
 ##############################################################
diff --git a/variants/adafruit_feather_esp32s2/bootloader.bin b/variants/adafruit_feather_esp32s2/bootloader.bin
index e2797e37f9d..857327ea6d4 100644
Binary files a/variants/adafruit_feather_esp32s2/bootloader.bin and b/variants/adafruit_feather_esp32s2/bootloader.bin differ
diff --git a/variants/adafruit_feather_esp32s2/tinyuf2.bin b/variants/adafruit_feather_esp32s2/tinyuf2.bin
index 434c8c97adc..17143a676ee 100644
Binary files a/variants/adafruit_feather_esp32s2/tinyuf2.bin and b/variants/adafruit_feather_esp32s2/tinyuf2.bin differ
diff --git a/variants/adafruit_funhouse_esp32s2/bootloader.bin b/variants/adafruit_funhouse_esp32s2/bootloader.bin
index a8d573b0491..b2eb0caa2b1 100644
Binary files a/variants/adafruit_funhouse_esp32s2/bootloader.bin and b/variants/adafruit_funhouse_esp32s2/bootloader.bin differ
diff --git a/variants/adafruit_funhouse_esp32s2/tinyuf2.bin b/variants/adafruit_funhouse_esp32s2/tinyuf2.bin
index 9b344159d75..6fa2ea6eee5 100644
Binary files a/variants/adafruit_funhouse_esp32s2/tinyuf2.bin and b/variants/adafruit_funhouse_esp32s2/tinyuf2.bin differ
diff --git a/variants/adafruit_magtag29_esp32s2/bootloader.bin b/variants/adafruit_magtag29_esp32s2/bootloader.bin
index 2ba2cd8c433..264bc74a3be 100644
Binary files a/variants/adafruit_magtag29_esp32s2/bootloader.bin and b/variants/adafruit_magtag29_esp32s2/bootloader.bin differ
diff --git a/variants/adafruit_magtag29_esp32s2/tinyuf2.bin b/variants/adafruit_magtag29_esp32s2/tinyuf2.bin
index 8f78bc9d0cb..8051c93cb47 100644
Binary files a/variants/adafruit_magtag29_esp32s2/tinyuf2.bin and b/variants/adafruit_magtag29_esp32s2/tinyuf2.bin differ
diff --git a/variants/adafruit_metro_esp32s2/bootloader.bin b/variants/adafruit_metro_esp32s2/bootloader.bin
index 87938c4771a..ae9d2706e2c 100644
Binary files a/variants/adafruit_metro_esp32s2/bootloader.bin and b/variants/adafruit_metro_esp32s2/bootloader.bin differ
diff --git a/variants/adafruit_metro_esp32s2/tinyuf2.bin b/variants/adafruit_metro_esp32s2/tinyuf2.bin
index 33c7995162d..6bad0459a6d 100644
Binary files a/variants/adafruit_metro_esp32s2/tinyuf2.bin and b/variants/adafruit_metro_esp32s2/tinyuf2.bin differ