diff --git a/boards.txt b/boards.txt
index 535ec667ad2..8a124297e6f 100644
--- a/boards.txt
+++ b/boards.txt
@@ -9831,9 +9831,14 @@ adafruit_metro_esp32s2.menu.PSRAM.disabled.build.defines=
adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_metro_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_metro_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_metro_esp32s2.menu.PartitionScheme.default.build.partitions=default
adafruit_metro_esp32s2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -9920,6 +9925,13 @@ adafruit_metro_esp32s2.menu.EraseFlash.none.upload.erase_cmd=
adafruit_metro_esp32s2.menu.EraseFlash.all=Enabled
adafruit_metro_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_metro_esp32s2.menu.ZigbeeMode.default=Disabled
+adafruit_metro_esp32s2.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_metro_esp32s2.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_metro_esp32s2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_metro_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_metro_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Metro ESP32-S3
@@ -10019,9 +10031,14 @@ adafruit_metro_esp32s3.menu.PSRAM.disabled.build.psram_type=opi
adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 16MB (2MB APP/11.6MB FATFS)
adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-16MB-tinyuf2
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-16MB
adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2_noota=TinyUF2 16MB No OTA(4MB APP/11.6MB FATFS)
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-16MB-noota
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=4194304
+adafruit_metro_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_metro_esp32s3.menu.PartitionScheme.default_16MB=Default (6.25MB APP/3.43MB SPIFFS)
adafruit_metro_esp32s3.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
adafruit_metro_esp32s3.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
@@ -10105,6 +10122,13 @@ adafruit_metro_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
adafruit_metro_esp32s3.menu.EraseFlash.all=Enabled
adafruit_metro_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_metro_esp32s3.menu.ZigbeeMode.default=Disabled
+adafruit_metro_esp32s3.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_metro_esp32s3.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_metro_esp32s3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_metro_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_metro_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit MagTag 2.9"
@@ -10181,9 +10205,14 @@ adafruit_magtag29_esp32s2.menu.PSRAM.disabled.build.defines=
adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_magtag29_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_magtag29_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_magtag29_esp32s2.menu.PartitionScheme.default.build.partitions=default
adafruit_magtag29_esp32s2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -10270,6 +10299,13 @@ adafruit_magtag29_esp32s2.menu.EraseFlash.none.upload.erase_cmd=
adafruit_magtag29_esp32s2.menu.EraseFlash.all=Enabled
adafruit_magtag29_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_magtag29_esp32s2.menu.ZigbeeMode.default=Disabled
+adafruit_magtag29_esp32s2.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_magtag29_esp32s2.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_magtag29_esp32s2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_magtag29_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_magtag29_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit FunHouse
@@ -10346,9 +10382,14 @@ adafruit_funhouse_esp32s2.menu.PSRAM.disabled.build.defines=
adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_funhouse_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_funhouse_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_funhouse_esp32s2.menu.PartitionScheme.default.build.partitions=default
adafruit_funhouse_esp32s2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -10435,6 +10476,13 @@ adafruit_funhouse_esp32s2.menu.EraseFlash.none.upload.erase_cmd=
adafruit_funhouse_esp32s2.menu.EraseFlash.all=Enabled
adafruit_funhouse_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_funhouse_esp32s2.menu.ZigbeeMode.default=Disabled
+adafruit_funhouse_esp32s2.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_funhouse_esp32s2.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_funhouse_esp32s2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_funhouse_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_funhouse_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit ESP32 Feather
@@ -10562,6 +10610,13 @@ featheresp32.menu.EraseFlash.none.upload.erase_cmd=
featheresp32.menu.EraseFlash.all=Enabled
featheresp32.menu.EraseFlash.all.upload.erase_cmd=-e
+featheresp32.menu.ZigbeeMode.default=Disabled
+featheresp32.menu.ZigbeeMode.default.build.zigbee_mode=
+featheresp32.menu.ZigbeeMode.default.build.zigbee_libs=
+featheresp32.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+featheresp32.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+featheresp32.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32 V2
@@ -10673,6 +10728,13 @@ adafruit_feather_esp32_v2.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32_v2.menu.EraseFlash.all=Enabled
adafruit_feather_esp32_v2.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32_v2.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32_v2.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32_v2.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32_v2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32_v2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32_v2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32-S2
@@ -10749,9 +10811,14 @@ adafruit_feather_esp32s2.menu.PSRAM.disabled.build.defines=
adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_feather_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
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)
@@ -10838,6 +10905,13 @@ adafruit_feather_esp32s2.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32s2.menu.EraseFlash.all=Enabled
adafruit_feather_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32s2.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32s2.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32s2.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32s2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32-S2 TFT
@@ -10914,9 +10988,14 @@ adafruit_feather_esp32s2_tft.menu.PSRAM.disabled.build.defines=
adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_feather_esp32s2_tft.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_feather_esp32s2_tft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_feather_esp32s2_tft.menu.PartitionScheme.default.build.partitions=default
adafruit_feather_esp32s2_tft.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -11003,6 +11082,13 @@ adafruit_feather_esp32s2_tft.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32s2_tft.menu.EraseFlash.all=Enabled
adafruit_feather_esp32s2_tft.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32s2_tft.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32s2_tft.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32s2_tft.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32s2_tft.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32s2_tft.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32s2_tft.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32-S2 Reverse TFT
@@ -11079,9 +11165,14 @@ adafruit_feather_esp32s2_reversetft.menu.PSRAM.disabled.build.defines=
adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.default.build.partitions=default
adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -11168,6 +11259,13 @@ adafruit_feather_esp32s2_reversetft.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32s2_reversetft.menu.EraseFlash.all=Enabled
adafruit_feather_esp32s2_reversetft.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32s2_reversetft.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32s2_reversetft.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32s2_reversetft.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32s2_reversetft.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32s2_reversetft.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32s2_reversetft.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32-S3 2MB PSRAM
@@ -11270,9 +11368,14 @@ adafruit_feather_esp32s3.menu.PSRAM.opi.build.psram_type=opi
adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_feather_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_feather_esp32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_feather_esp32s3.menu.PartitionScheme.default.build.partitions=default
adafruit_feather_esp32s3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -11368,6 +11471,13 @@ adafruit_feather_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32s3.menu.EraseFlash.all=Enabled
adafruit_feather_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32s3.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32s3.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32s3.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32s3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32-S3 No PSRAM
@@ -11460,9 +11570,14 @@ adafruit_feather_esp32s3_nopsram.menu.UploadMode.default.upload.wait_for_upload_
adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FATFS)
adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-8MB
adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota=TinyUF2 8MB No OTA (4MB APP/3.7MB FATFS)
+adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-8MB-noota
+adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=4194304
+adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
adafruit_feather_esp32s3_nopsram.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
@@ -11537,6 +11652,13 @@ adafruit_feather_esp32s3_nopsram.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32s3_nopsram.menu.EraseFlash.all=Enabled
adafruit_feather_esp32s3_nopsram.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32s3_nopsram.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32s3_nopsram.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32s3_nopsram.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32s3_nopsram.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32s3_nopsram.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32s3_nopsram.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32-S3 TFT
@@ -11639,9 +11761,14 @@ adafruit_feather_esp32s3_tft.menu.PSRAM.opi.build.psram_type=opi
adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_feather_esp32s3_tft.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_feather_esp32s3_tft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_feather_esp32s3_tft.menu.PartitionScheme.default.build.partitions=default
adafruit_feather_esp32s3_tft.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -11737,6 +11864,13 @@ adafruit_feather_esp32s3_tft.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32s3_tft.menu.EraseFlash.all=Enabled
adafruit_feather_esp32s3_tft.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32s3_tft.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32s3_tft.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32s3_tft.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32s3_tft.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32s3_tft.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32s3_tft.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit Feather ESP32-S3 Reverse TFT
@@ -11839,9 +11973,14 @@ adafruit_feather_esp32s3_reversetft.menu.PSRAM.opi.build.psram_type=opi
adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.default.build.partitions=default
adafruit_feather_esp32s3_reversetft.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -11937,6 +12076,13 @@ adafruit_feather_esp32s3_reversetft.menu.EraseFlash.none.upload.erase_cmd=
adafruit_feather_esp32s3_reversetft.menu.EraseFlash.all=Enabled
adafruit_feather_esp32s3_reversetft.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_feather_esp32s3_reversetft.menu.ZigbeeMode.default=Disabled
+adafruit_feather_esp32s3_reversetft.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_feather_esp32s3_reversetft.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_feather_esp32s3_reversetft.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_feather_esp32s3_reversetft.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_feather_esp32s3_reversetft.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit QT Py ESP32
@@ -12048,6 +12194,13 @@ adafruit_qtpy_esp32_pico.menu.EraseFlash.none.upload.erase_cmd=
adafruit_qtpy_esp32_pico.menu.EraseFlash.all=Enabled
adafruit_qtpy_esp32_pico.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_qtpy_esp32_pico.menu.ZigbeeMode.default=Disabled
+adafruit_qtpy_esp32_pico.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_qtpy_esp32_pico.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_qtpy_esp32_pico.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_qtpy_esp32_pico.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_qtpy_esp32_pico.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit QT Py ESP32-C3
@@ -12178,6 +12331,13 @@ adafruit_qtpy_esp32c3.menu.EraseFlash.none.upload.erase_cmd=
adafruit_qtpy_esp32c3.menu.EraseFlash.all=Enabled
adafruit_qtpy_esp32c3.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_qtpy_esp32c3.menu.ZigbeeMode.default=Disabled
+adafruit_qtpy_esp32c3.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_qtpy_esp32c3.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_qtpy_esp32c3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_qtpy_esp32c3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_qtpy_esp32c3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit QT Py ESP32-S2
@@ -12254,9 +12414,14 @@ adafruit_qtpy_esp32s2.menu.PSRAM.disabled.build.defines=
adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_qtpy_esp32s2.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_qtpy_esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_qtpy_esp32s2.menu.PartitionScheme.default.build.partitions=default
adafruit_qtpy_esp32s2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -12343,6 +12508,13 @@ adafruit_qtpy_esp32s2.menu.EraseFlash.none.upload.erase_cmd=
adafruit_qtpy_esp32s2.menu.EraseFlash.all=Enabled
adafruit_qtpy_esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_qtpy_esp32s2.menu.ZigbeeMode.default=Disabled
+adafruit_qtpy_esp32s2.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_qtpy_esp32s2.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_qtpy_esp32s2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_qtpy_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_qtpy_esp32s2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit QT Py ESP32-S3 No PSRAM
@@ -12435,9 +12607,14 @@ adafruit_qtpy_esp32s3_nopsram.menu.UploadMode.default.upload.wait_for_upload_por
adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FATFS)
adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-8MB
adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota=TinyUF2 8MB No OTA (4MB APP/3.7MB FATFS)
+adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-8MB-noota
+adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=4194304
+adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
adafruit_qtpy_esp32s3_nopsram.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
@@ -12512,6 +12689,13 @@ adafruit_qtpy_esp32s3_nopsram.menu.EraseFlash.none.upload.erase_cmd=
adafruit_qtpy_esp32s3_nopsram.menu.EraseFlash.all=Enabled
adafruit_qtpy_esp32s3_nopsram.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_qtpy_esp32s3_nopsram.menu.ZigbeeMode.default=Disabled
+adafruit_qtpy_esp32s3_nopsram.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_qtpy_esp32s3_nopsram.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_qtpy_esp32s3_nopsram.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_qtpy_esp32s3_nopsram.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_qtpy_esp32s3_nopsram.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit QT Py ESP32-S3 (4M Flash 2M PSRAM)
@@ -12614,9 +12798,14 @@ adafruit_qtpy_esp32s3_n4r2.menu.PSRAM.opi.build.psram_type=opi
adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.default.build.partitions=default
adafruit_qtpy_esp32s3_n4r2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -12712,6 +12901,13 @@ adafruit_qtpy_esp32s3_n4r2.menu.EraseFlash.none.upload.erase_cmd=
adafruit_qtpy_esp32s3_n4r2.menu.EraseFlash.all=Enabled
adafruit_qtpy_esp32s3_n4r2.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_qtpy_esp32s3_n4r2.menu.ZigbeeMode.default=Disabled
+adafruit_qtpy_esp32s3_n4r2.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_qtpy_esp32s3_n4r2.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_qtpy_esp32s3_n4r2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_qtpy_esp32s3_n4r2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_qtpy_esp32s3_n4r2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit ItsyBitsy ESP32
@@ -12823,6 +13019,13 @@ adafruit_itsybitsy_esp32.menu.EraseFlash.none.upload.erase_cmd=
adafruit_itsybitsy_esp32.menu.EraseFlash.all=Enabled
adafruit_itsybitsy_esp32.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_itsybitsy_esp32.menu.ZigbeeMode.default=Disabled
+adafruit_itsybitsy_esp32.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_itsybitsy_esp32.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_itsybitsy_esp32.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_itsybitsy_esp32.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_itsybitsy_esp32.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
# Adafruit MatrixPortal ESP32-S3
@@ -12925,9 +13128,14 @@ adafruit_matrixportal_esp32s3.menu.PSRAM.opi.build.psram_type=opi
adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FATFS)
adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB-tinyuf2
+adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-8MB
adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2_noota=TinyUF2 8MB No OTA (4MB APP/3.7MB FATFS)
+adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-8MB-noota
+adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=4194304
+adafruit_matrixportal_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_matrixportal_esp32s3.menu.PartitionScheme.default_8MB=Default (3MB APP/1.5MB SPIFFS)
adafruit_matrixportal_esp32s3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
adafruit_matrixportal_esp32s3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
@@ -13002,16 +13210,23 @@ adafruit_matrixportal_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
adafruit_matrixportal_esp32s3.menu.EraseFlash.all=Enabled
adafruit_matrixportal_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_matrixportal_esp32s3.menu.ZigbeeMode.default=Disabled
+adafruit_matrixportal_esp32s3.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_matrixportal_esp32s3.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_matrixportal_esp32s3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_matrixportal_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_matrixportal_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
-# Adafruit Camera ESP32-S3
+# Adafruit pyCamera S3
adafruit_camera_esp32s3.name=Adafruit pyCamera S3
adafruit_camera_esp32s3.vid.0=0x239A
adafruit_camera_esp32s3.pid.0=0x0117
adafruit_camera_esp32s3.vid.1=0x239A
adafruit_camera_esp32s3.pid.1=0x8117
-adafruit_camera_esp32s3.vid.1=0x239A
-adafruit_camera_esp32s3.pid.1=0x8118
+adafruit_camera_esp32s3.vid.2=0x239A
+adafruit_camera_esp32s3.pid.2=0x8118
adafruit_camera_esp32s3.bootloader.tool=esptool_py
adafruit_camera_esp32s3.bootloader.tool.default=esptool_py
@@ -13020,8 +13235,8 @@ adafruit_camera_esp32s3.upload.tool=esptool_py
adafruit_camera_esp32s3.upload.tool.default=esptool_py
adafruit_camera_esp32s3.upload.tool.network=esp_ota
-adafruit_camera_esp32s3.upload.maximum_size=327680
-adafruit_camera_esp32s3.upload.maximum_data_size=1310720
+adafruit_camera_esp32s3.upload.maximum_size=1310720
+adafruit_camera_esp32s3.upload.maximum_data_size=327680
adafruit_camera_esp32s3.upload.flags=
adafruit_camera_esp32s3.upload.extra_flags=
adafruit_camera_esp32s3.upload.use_1200bps_touch=true
@@ -13102,10 +13317,15 @@ adafruit_camera_esp32s3.menu.PSRAM.opi=OPI PSRAM
adafruit_camera_esp32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
adafruit_camera_esp32s3.menu.PSRAM.opi.build.psram_type=opi
-adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (2.6MB APP/960KB FATFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2_noota=TinyUF2 4MB No OTA (2.7MB APP/960KB FATFS)
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-4MB-noota
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=2883584
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FATFS)
adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-1ota
-adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=2883584
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-4MB
+adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
adafruit_camera_esp32s3.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_camera_esp32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
adafruit_camera_esp32s3.menu.PartitionScheme.default.build.partitions=default
@@ -13202,6 +13422,12 @@ adafruit_camera_esp32s3.menu.EraseFlash.none.upload.erase_cmd=
adafruit_camera_esp32s3.menu.EraseFlash.all=Enabled
adafruit_camera_esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_camera_esp32s3.menu.ZigbeeMode.default=Disabled
+adafruit_camera_esp32s3.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_camera_esp32s3.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_camera_esp32s3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_camera_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_camera_esp32s3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
##############################################################
# Adafruit Qualia ESP32-S3 RGB666
@@ -13302,9 +13528,14 @@ adafruit_qualia_s3_rgb666.menu.PSRAM.disabled.build.psram_type=opi
adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2=TinyUF2 16MB (2MB APP/11.6MB FATFS)
adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
-adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-16MB-tinyuf2
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.build.partitions=tinyuf2-partitions-16MB
adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2_noota=TinyUF2 16MB No OTA(4MB APP/11.6MB FATFS)
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2_noota.build.custom_bootloader=bootloader-tinyuf2
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2_noota.build.partitions=tinyuf2-partitions-16MB-noota
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2_noota.upload.maximum_size=4194304
+adafruit_qualia_s3_rgb666.menu.PartitionScheme.tinyuf2_noota.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
adafruit_qualia_s3_rgb666.menu.PartitionScheme.default_16MB=Default (6.25MB APP/3.43MB SPIFFS)
adafruit_qualia_s3_rgb666.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
adafruit_qualia_s3_rgb666.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
@@ -13388,6 +13619,13 @@ adafruit_qualia_s3_rgb666.menu.EraseFlash.none.upload.erase_cmd=
adafruit_qualia_s3_rgb666.menu.EraseFlash.all=Enabled
adafruit_qualia_s3_rgb666.menu.EraseFlash.all.upload.erase_cmd=-e
+adafruit_qualia_s3_rgb666.menu.ZigbeeMode.default=Disabled
+adafruit_qualia_s3_rgb666.menu.ZigbeeMode.default.build.zigbee_mode=
+adafruit_qualia_s3_rgb666.menu.ZigbeeMode.default.build.zigbee_libs=
+adafruit_qualia_s3_rgb666.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+adafruit_qualia_s3_rgb666.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+adafruit_qualia_s3_rgb666.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
##############################################################
nodemcu-32s.name=NodeMCU-32S
diff --git a/variants/adafruit_camera_esp32s3/partitions-4MB-1ota.csv b/variants/adafruit_camera_esp32s3/partitions-4MB-1ota.csv
deleted file mode 100644
index ab7fa8669d0..00000000000
--- a/variants/adafruit_camera_esp32s3/partitions-4MB-1ota.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, app, ota_0, 0x10000, 2816K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_feather_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_feather_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_feather_esp32s2_reversetft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s2_reversetft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_feather_esp32s2_reversetft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_feather_esp32s2_tft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s2_tft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_feather_esp32s2_tft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_feather_esp32s3/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_feather_esp32s3/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_feather_esp32s3_nopsram/partitions-8MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
deleted file mode 100644
index 4026378b6fb..00000000000
--- a/variants/adafruit_feather_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table,, 0x8000, 4K
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 2048K,
-ota_1, 0, ota_1, 0x210000, 2048K,
-uf2, app, factory,0x410000, 256K,
-ffat, data, fat, 0x450000, 3776K,
diff --git a/variants/adafruit_feather_esp32s3_reversetft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3_reversetft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_feather_esp32s3_reversetft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_feather_esp32s3_tft/partitions-4MB-tinyuf2.csv b/variants/adafruit_feather_esp32s3_tft/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_feather_esp32s3_tft/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_funhouse_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_funhouse_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_funhouse_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_magtag29_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_magtag29_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_magtag29_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_matrixportal_esp32s3/partitions-8MB-tinyuf2.csv b/variants/adafruit_matrixportal_esp32s3/partitions-8MB-tinyuf2.csv
deleted file mode 100644
index a68b39e9fa7..00000000000
--- a/variants/adafruit_matrixportal_esp32s3/partitions-8MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table,, 0x8000, 4K
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, app, ota_0, 0x10000, 2048K,
-ota_1, app, ota_1, 0x210000, 2048K,
-uf2, app, factory,0x410000, 256K,
-ffat, data, fat, 0x450000, 3776K,
diff --git a/variants/adafruit_metro_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_metro_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_metro_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv b/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv
deleted file mode 100644
index 55f6c2b8d76..00000000000
--- a/variants/adafruit_metro_esp32s3/partitions-16MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table,, 0x8000, 4K
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, app, ota_0, 0x10000, 2048K,
-ota_1, app, ota_1, 0x210000, 2048K,
-uf2, app, factory,0x410000, 256K,
-ffat, data, fat, 0x450000, 11968K,
diff --git a/variants/adafruit_qtpy_esp32s2/partitions-4MB-tinyuf2.csv b/variants/adafruit_qtpy_esp32s2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index 164ba0d5965..00000000000
--- a/variants/adafruit_qtpy_esp32s2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 1408K,
-ota_1, 0, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_qtpy_esp32s3_n4r2/partitions-4MB-tinyuf2.csv b/variants/adafruit_qtpy_esp32s3_n4r2/partitions-4MB-tinyuf2.csv
deleted file mode 100644
index f3112a23b11..00000000000
--- a/variants/adafruit_qtpy_esp32s3_n4r2/partitions-4MB-tinyuf2.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table, 0x8000, 4K
-
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, app, ota_0, 0x10000, 1408K,
-ota_1, app, ota_1, 0x170000, 1408K,
-uf2, app, factory,0x2d0000, 256K,
-ffat, data, fat, 0x310000, 960K,
diff --git a/variants/adafruit_qtpy_esp32s3_nopsram/partitions-8MB-tinyuf2.csv b/variants/adafruit_qtpy_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
deleted file mode 100644
index 4026378b6fb..00000000000
--- a/variants/adafruit_qtpy_esp32s3_nopsram/partitions-8MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table,, 0x8000, 4K
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, 0, ota_0, 0x10000, 2048K,
-ota_1, 0, ota_1, 0x210000, 2048K,
-uf2, app, factory,0x410000, 256K,
-ffat, data, fat, 0x450000, 3776K,
diff --git a/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv b/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv
deleted file mode 100644
index 55f6c2b8d76..00000000000
--- a/variants/adafruit_qualia_s3_rgb666/partitions-16MB-tinyuf2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-# ESP-IDF Partition Table
-# Name, Type, SubType, Offset, Size, Flags
-# bootloader.bin,, 0x1000, 32K
-# partition table,, 0x8000, 4K
-nvs, data, nvs, 0x9000, 20K,
-otadata, data, ota, 0xe000, 8K,
-ota_0, app, ota_0, 0x10000, 2048K,
-ota_1, app, ota_1, 0x210000, 2048K,
-uf2, app, factory,0x410000, 256K,
-ffat, data, fat, 0x450000, 11968K,