diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index 90fa1ece0c..4b058f7d47 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -59,59 +59,61 @@ include $(TOP)/supervisor/supervisor.mk
 # Include make rules and variables common across CircuitPython builds.
 include $(TOP)/py/circuitpy_defns.mk
 
-CROSS_COMPILE = xtensa-esp32s2-elf-
+CROSS_COMPILE = xtensa-$(IDF_TARGET)-elf-
 
 #######################################
 # CFLAGS
 #######################################
 
-INC += -I.
-INC += -I./boards
-INC += -I./boards/$(BOARD)
-INC += -I./peripherals
-INC += -I../..
-INC += -I../../lib/mp-readline
-INC += -I../../lib/tinyusb/src
-INC += -I../../supervisor/shared/usb
-INC += -I$(BUILD)
-INC += -I$(BUILD)/genhdr
-INC += -I$(BUILD)/esp-idf/config
-
-INC += -isystem esp-idf
-INC += -isystem esp-idf/components/app_update/include
-INC += -isystem esp-idf/components/bootloader_support/include
-INC += -isystem esp-idf/components/driver/esp32s2/include
-INC += -isystem esp-idf/components/driver/include
-INC += -isystem esp-idf/components/esp32s2/include
-INC += -isystem esp-idf/components/esp_common/include
-INC += -isystem esp-idf/components/esp_event/include
-INC += -isystem esp-idf/components/esp_hw_support/include
-INC += -isystem esp-idf/components/esp_netif/include
-INC += -isystem esp-idf/components/esp_pm/include
-INC += -isystem esp-idf/components/esp_ringbuf/include
-INC += -isystem esp-idf/components/esp_rom/include
-INC += -isystem esp-idf/components/esp_system/include
-INC += -isystem esp-idf/components/esp_timer/include
-INC += -isystem esp-idf/components/esp_wifi/include
-INC += -isystem esp-idf/components/freertos/include
-INC += -isystem esp-idf/components/freertos/include/freertos
-INC += -isystem esp-idf/components/freertos/port/xtensa/include
-INC += -isystem esp-idf/components/hal/include
-INC += -isystem esp-idf/components/hal/esp32s2/include
-INC += -isystem esp-idf/components/heap/include
-INC += -isystem esp-idf/components/log/include/
-INC += -isystem esp-idf/components/lwip/lwip/src/include
-INC += -isystem esp-idf/components/lwip/port/esp32/include
-INC += -isystem esp-idf/components/lwip/include/apps/sntp
-INC += -isystem esp-idf/components/mbedtls/mbedtls/include
-INC += -isystem esp-idf/components/mbedtls/port/include/
-INC += -isystem esp-idf/components/newlib/platform_include
-INC += -isystem esp-idf/components/nvs_flash/include
-INC += -isystem esp-idf/components/soc/include
-INC += -isystem esp-idf/components/soc/esp32s2/include
-INC += -isystem esp-idf/components/spi_flash/include
-INC += -isystem esp-idf/components/xtensa/esp32s2/include
-INC += -isystem esp-idf/components/xtensa/include
+INC += -I.\
+	   -I./boards \
+	   -I./boards/$(BOARD) \
+	   -I./peripherals \
+	   -I../.. \
+	   -I../../lib/mp-readline \
+	   -I../../lib/tinyusb/src \
+	   -I../../supervisor/shared/usb \
+	   -I$(BUILD) \
+	   -I$(BUILD)/genhdr \
+	   -I$(BUILD)/esp-idf/config \
+	   -isystem esp-idf \
+	   -isystem esp-idf/components/app_update/include \
+	   -isystem esp-idf/components/bootloader_support/include \
+	   -isystem esp-idf/components/driver/include \
+	   -isystem esp-idf/components/driver/$(IDF_TARGET)/include \
+	   -isystem esp-idf/components/$(IDF_TARGET)/include \
+	   -isystem esp-idf/components/esp_adc_cal/include \
+	   -isystem esp-idf/components/esp_common/include \
+	   -isystem esp-idf/components/esp_event/include \
+	   -isystem esp-idf/components/esp_hw_support/include \
+	   -isystem esp-idf/components/esp_netif/include \
+	   -isystem esp-idf/components/esp_pm/include \
+	   -isystem esp-idf/components/esp_ringbuf/include \
+	   -isystem esp-idf/components/esp_rom/include \
+	   -isystem esp-idf/components/esp_system/include \
+	   -isystem esp-idf/components/esp_timer/include \
+	   -isystem esp-idf/components/esp_wifi/include \
+	   -isystem esp-idf/components/freertos/include \
+	   -isystem esp-idf/components/freertos/include/freertos \
+	   -isystem esp-idf/components/freertos/port/xtensa/include \
+	   -isystem esp-idf/components/hal/include \
+	   -isystem esp-idf/components/hal/$(IDF_TARGET)/include \
+	   -isystem esp-idf/components/hal/platform_port/include \
+	   -isystem esp-idf/components/heap/include \
+	   -isystem esp-idf/components/log/include \
+	   -isystem esp-idf/components/lwip/include \
+	   -isystem esp-idf/components/lwip/lwip/src/include \
+	   -isystem esp-idf/components/lwip/port/esp32/include \
+	   -isystem esp-idf/components/mbedtls/esp_crt_bundle/include \
+	   -isystem esp-idf/components/mbedtls/mbedtls/include \
+	   -isystem esp-idf/components/mbedtls/port/include \
+	   -isystem esp-idf/components/newlib/platform_include \
+	   -isystem esp-idf/components/nvs_flash/include \
+	   -isystem esp-idf/components/soc/include \
+	   -isystem esp-idf/components/soc/$(IDF_TARGET)/include \
+	   -isystem esp-idf/components/spi_flash/include \
+	   -isystem esp-idf/components/xtensa/include \
+	   -isystem esp-idf/components/xtensa/$(IDF_TARGET)/include
 
 CFLAGS += -DHAVE_CONFIG_H \
           -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" \
@@ -141,19 +143,19 @@ CFLAGS += $(INC) -Werror -Wall -mlongcalls -std=gnu11 -Wl,--gc-sections $(BASE_C
 
 LDFLAGS = $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
 
-LDFLAGS += -L$(BUILD)/esp-idf/esp-idf/esp32s2 \
-		   -L$(BUILD)/esp-idf/esp-idf/esp32s2/ld \
-		   -Lesp-idf/components/esp32s2/ld \
-		   -Lesp-idf/components/esp_rom/esp32s2/ld \
-		   -Tesp32s2_out.ld \
-		   -Tesp32s2.project.ld \
-		   -Tesp32s2.peripherals.ld \
-		   -Tesp32s2.rom.ld \
-		   -Tesp32s2.rom.api.ld \
-		   -Tesp32s2.rom.libgcc.ld \
-		   -Tesp32s2.rom.newlib-data.ld \
-		   -Tesp32s2.rom.newlib-funcs.ld \
-		   -Tesp32s2.rom.spiflash.ld
+LDFLAGS += -L$(BUILD)/esp-idf/esp-idf/$(IDF_TARGET) \
+		   -L$(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/ld \
+		   -Lesp-idf/components/$(IDF_TARGET)/ld \
+		   -Lesp-idf/components/esp_rom/$(IDF_TARGET)/ld \
+		   -T$(IDF_TARGET)_out.ld \
+		   -T$(IDF_TARGET).project.ld \
+		   -T$(IDF_TARGET).peripherals.ld \
+		   -T$(IDF_TARGET).rom.ld \
+		   -T$(IDF_TARGET).rom.api.ld \
+		   -T$(IDF_TARGET).rom.libgcc.ld \
+		   -T$(IDF_TARGET).rom.newlib-data.ld \
+		   -T$(IDF_TARGET).rom.newlib-funcs.ld \
+		   -T$(IDF_TARGET).rom.spiflash.ld
 
 LDFLAGS += -Wl,-Bstatic \
 		   -Wl,--no-warn-mismatch \
@@ -188,11 +190,11 @@ SRC_C += \
 	boards/$(BOARD)/pins.c \
 	modules/$(CIRCUITPY_MODULE).c \
 	lib/netutils/netutils.c \
+	peripherals/pcnt.c \
+	peripherals/rmt.c \
 	peripherals/timer.c \
 	peripherals/touch.c \
-	peripherals/pcnt.c \
-	peripherals/pins.c \
-	peripherals/rmt.c
+	peripherals/$(IDF_TARGET)/pins.c
 
 ifneq ($(CIRCUITPY_USB),0)
 SRC_C += lib/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c
@@ -246,23 +248,22 @@ ifeq ($(DEBUG), 1)
 else
 	DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-opt.defaults
 endif
-SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);boards/$(BOARD)/sdkconfig
+SDKCONFIGS = esp-idf-config/$(IDF_TARGET)/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);boards/$(BOARD)/sdkconfig
 
 # create the config headers
 $(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig | $(BUILD)/esp-idf
-	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-esp32s2.cmake -DIDF_TARGET=esp32s2 -GNinja
+	IDF_PATH=$(IDF_PATH) cmake -S . -B $(BUILD)/esp-idf -DSDKCONFIG=$(BUILD)/esp-idf/sdkconfig -DSDKCONFIG_DEFAULTS="$(SDKCONFIGS)" -DCMAKE_TOOLCHAIN_FILE=$(IDF_PATH)/tools/cmake/toolchain-$(IDF_TARGET).cmake -DIDF_TARGET=$(IDF_TARGET) -GNinja
 
 # build a lib
 # Adding -d explain -j 1 -v to the ninja line will output debug info
 #$(BUILD)/esp-idf/esp-idf/%.a: $(BUILD)/esp-idf/config/sdkconfig.h
 #	ninja -C $(BUILD)/esp-idf esp-idf/$*.a
 
-$(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld: $(BUILD)/esp-idf/config/sdkconfig.h
-	ninja -C $(BUILD)/esp-idf esp-idf/esp32s2/esp32s2_out.ld
-
-$(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld: $(BUILD)/esp-idf/config/sdkconfig.h
-	ninja -C $(BUILD)/esp-idf esp-idf/esp32s2/ld/esp32s2.project.ld
+$(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/$(IDF_TARGET)_out.ld: $(BUILD)/esp-idf/config/sdkconfig.h
+	ninja -C $(BUILD)/esp-idf esp-idf/$(IDF_TARGET)/$(IDF_TARGET)_out.ld
 
+$(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/ld/$(IDF_TARGET).project.ld: $(BUILD)/esp-idf/config/sdkconfig.h
+	ninja -C $(BUILD)/esp-idf esp-idf/$(IDF_TARGET)/ld/$(IDF_TARGET).project.ld
 
 $(BUILD)/esp-idf/partition_table/partition-table.bin: $(BUILD)/esp-idf/config/sdkconfig.h
 	IDF_PATH=$(IDF_PATH) ninja -C $(BUILD)/esp-idf partition_table/partition-table.bin
@@ -276,7 +277,7 @@ menuconfig: $(BUILD)/esp-idf/config
 # qstr builds include headers so we need to make sure they are up to date
 $(HEADER_BUILD)/qstr.split: | $(BUILD)/esp-idf/config/sdkconfig.h
 
-ESP_IDF_COMPONENTS_LINK = app_update bootloader_support driver efuse esp32s2 esp_adc_cal esp_common esp_event esp_hw_support esp_netif esp_pm esp_ringbuf esp_rom esp_system esp_timer esp-tls esp_wifi freertos hal heap log lwip mbedtls newlib nvs_flash pthread soc spi_flash vfs wpa_supplicant xtensa
+ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET) app_update bootloader_support driver efuse esp_adc_cal esp_common esp_event esp_hw_support esp_netif esp_pm esp_ringbuf esp_rom esp_system esp_timer esp-tls esp_wifi freertos hal heap log lwip mbedtls newlib nvs_flash pthread soc spi_flash vfs wpa_supplicant xtensa
 
 ESP_IDF_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
 ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
@@ -284,12 +285,12 @@ ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENT
 MBEDTLS_COMPONENTS_LINK = crypto tls x509
 MBEDTLS_COMPONENTS_LINK_EXPANDED = $(foreach component, $(MBEDTLS_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/mbedtls/mbedtls/library/libmbed$(component).a)
 
-BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libxt_hal.a
+BINARY_BLOBS = esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
 BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a librtc.a libsmartconfig.a libphy.a
-BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/esp32s2/, $(BINARY_WIFI_BLOBS))
+BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS))
 
-ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/esp32s2/libxt_hal.a
-ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld
+ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
+ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/$(IDF_TARGET)_out.ld $(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/ld/$(IDF_TARGET).project.ld
 
 FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)
 
@@ -305,8 +306,8 @@ esp-idf-stamp: $(BUILD)/esp-idf/config/sdkconfig.h
 		esp-idf/bootloader_support/libbootloader_support.a \
 		esp-idf/driver/libdriver.a \
 		esp-idf/efuse/libefuse.a \
-		esp-idf/esp32s2/libesp32s2.a \
-		esp-idf/esp32s2/ld/esp32s2.project.ld \
+		esp-idf/$(IDF_TARGET)/lib$(IDF_TARGET).a \
+		esp-idf/$(IDF_TARGET)/ld/$(IDF_TARGET).project.ld \
 		esp-idf/esp_adc_cal/libesp_adc_cal.a \
 		esp-idf/esp_common/libesp_common.a \
 		esp-idf/esp_event/libesp_event.a \
@@ -340,7 +341,7 @@ $(BUILD)/firmware.elf: $(OBJ) | esp-idf-stamp
 
 $(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf | tools/build_memory_info.py
 	$(STEPECHO) "Create $@"
-	$(Q)esptool.py --chip esp32s2 elf2image $(FLASH_FLAGS) --elf-sha256-offset 0xb0 -o $@ $^
+	$(Q)esptool.py --chip $(IDF_TARGET) elf2image $(FLASH_FLAGS) --elf-sha256-offset 0xb0 -o $@ $^
 	$(Q)$(PYTHON3) tools/build_memory_info.py $< $(BUILD)/esp-idf/sdkconfig $@
 
 $(BUILD)/firmware.bin: $(BUILD)/circuitpython-firmware.bin | esp-idf-stamp
@@ -351,10 +352,10 @@ $(BUILD)/firmware.uf2: $(BUILD)/circuitpython-firmware.bin
 	$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xbfdd4eee -b 0x0000 -c -o $@ $^
 
 flash: $(BUILD)/firmware.bin
-	esptool.py --chip esp32s2 -p $(PORT) $(ESPTOOL_FLAGS) write_flash $(FLASH_FLAGS) 0x0000 $^
+	esptool.py --chip $(IDF_TARGET) -p $(PORT) $(ESPTOOL_FLAGS) write_flash $(FLASH_FLAGS) 0x0000 $^
 
 flash-circuitpython-only: $(BUILD)/circuitpython-firmware.bin
-	esptool.py --chip esp32s2 -p $(PORT) $(ESPTOOL_FLAGS) write_flash $(FLASH_FLAGS) 0x10000 $^
+	esptool.py --chip $(IDF_TARGET) -p $(PORT) $(ESPTOOL_FLAGS) write_flash $(FLASH_FLAGS) 0x10000 $^
 
 monitor: $(BUILD)/firmware.elf
 	cp $< build/circuitpython.elf
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk
index 3290f8cae3..fd8a37c18a 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80EC
 USB_PRODUCT = "Feather ESP32S2 no PSRAM"
 USB_MANUFACTURER = "Adafruit"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
index 3ba6f62289..01657b7ffd 100644
--- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80EE
 USB_PRODUCT = "Feather ESP32S2 TFT no PSRAM"
 USB_MANUFACTURER = "Adafruit"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
index b71ff9e558..bcad455108 100644
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80FA
 USB_PRODUCT = "FunHouse"
 USB_MANUFACTURER = "Adafruit"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
index 0a141cbe3e..4acef7fd94 100644
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80E6
 USB_PRODUCT = "MagTag"
 USB_MANUFACTURER = "Adafruit"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
index e78098d644..a7204b957d 100644
--- a/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80E0
 USB_PRODUCT = "Metro ESP32S2"
 USB_MANUFACTURER = "Adafruit"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
index 08baf474ee..1883b1fbfa 100644
--- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
+++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80A7
 USB_PRODUCT = "ESP 12k NodeMCU"
 USB_MANUFACTURER = "Ai-Thinker"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
index 8b6bfcb8d9..1f9d037ef2 100644
--- a/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
+++ b/ports/espressif/boards/artisense_rd00/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80AF
 USB_PRODUCT = "Reference Design RD00"
 USB_MANUFACTURER = "Artisense"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk
index 9a5d947e6c..79246b1393 100644
--- a/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk
+++ b/ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x8009
 USB_PRODUCT = "ATMegaZero ESP32-S2"
 USB_MANUFACTURER = "ATMegaZero"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
index 8eea211d6a..e55ca0e4e8 100644
--- a/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
+++ b/ports/espressif/boards/crumpspace_crumps2/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x3141
 USB_PRODUCT = "CrumpS2"
 USB_MANUFACTURER = "CrumpSpace"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
index 6a6ae7937e..8e2517ba23 100644
--- a/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
+++ b/ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0xBAB0
 USB_PRODUCT = "Bast WiFi"
 USB_MANUFACTURER = "ElectronicCats"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
index f9dbcfeee3..1b11f4fbee 100644
--- a/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x7001
 USB_PRODUCT = "ESP32-S2-HMI-DevKit-1"
 USB_MANUFACTURER = "Espressif"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
index 2dce038819..7823674329 100644
--- a/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80C8
 USB_PRODUCT = "Kaluga 1"
 USB_MANUFACTURER = "Espressif"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
index 2dce038819..7823674329 100644
--- a/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_kaluga_1/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80C8
 USB_PRODUCT = "Kaluga 1"
 USB_MANUFACTURER = "Espressif"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
index 9c9ca61694..f25cdc4a63 100644
--- a/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80A8
 USB_PRODUCT = "Saola 1 w/WROOM"
 USB_MANUFACTURER = "Espressif"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
index d5ff1c5ac8..b4154bf3a4 100644
--- a/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80A6
 USB_PRODUCT = "Saola 1 w/WROVER"
 USB_MANUFACTURER = "Espressif"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
index fc6c62257a..f1ed49a32a 100644
--- a/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80AA
 USB_PRODUCT = "Franzininho WIFI w/Wroom"
 USB_MANUFACTURER = "Espressif"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
index c0c47cef10..1478332fac 100644
--- a/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80AD
 USB_PRODUCT = "Franzininho WIFI w/Wrover"
 USB_MANUFACTURER = "Espressif"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
index 3e1fa2526a..ad9bce8cc0 100644
--- a/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80A4
 USB_PRODUCT = "Cucumber M"
 USB_MANUFACTURER = "Gravitech"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
index 7a0d84a311..c96ac0dc09 100644
--- a/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80A7
 USB_PRODUCT = "Cucumber MS"
 USB_MANUFACTURER = "Gravitech"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
index 018742b469..51f5fe468f 100644
--- a/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80A1
 USB_PRODUCT = "Cucumber R"
 USB_MANUFACTURER = "Gravitech"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
index 807dcaabbf..6cb8d13d8e 100644
--- a/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
+++ b/ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x800D
 USB_PRODUCT = "Cucumber RS"
 USB_MANUFACTURER = "Gravitech"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
index 79b45fd92c..c7795bbdeb 100644
--- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
+++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x8007
 USB_PRODUCT = "TTGO T8 ESP32-S2"
 USB_MANUFACTURER = "LILYGO"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk
index e4c7aacadd..5e40a1e13c 100644
--- a/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk
+++ b/ports/espressif/boards/lolin_s2_mini/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80C3
 USB_PRODUCT = "S2 Mini"
 USB_MANUFACTURER = "Lolin"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk
index 783e7ad4c7..28d5e047dc 100644
--- a/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/microdev_micro_s2/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80C6
 USB_PRODUCT = "microS2"
 USB_MANUFACTURER = "microDev"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
index aee744ca1a..567f2ddea1 100644
--- a/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
+++ b/ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80B7
 USB_PRODUCT = "MORPHESP-240"
 USB_MANUFACTURER = "MORPHEANS"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
index 736bbb5adc..7385906921 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80DE
 USB_PRODUCT = "nanoESP32-S2 w/Wroom"
 USB_MANUFACTURER = "Muselab"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
index 9904a06e4b..6060a5c581 100644
--- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80B2
 USB_PRODUCT = "nanoESP32-S2  w/Wrover"
 USB_MANUFACTURER = "Muselab"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
index c3880b6ae9..f4c0be83dc 100644
--- a/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
+++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x4DF0
 USB_PRODUCT = "Pixelwing ESP32S2"
 USB_MANUFACTURER = "Oak Dev Tech"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
index f88cb75d25..a64f49c144 100644
--- a/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x3252
 USB_PRODUCT = "Targett Module Clip w/Wroom"
 USB_MANUFACTURER = "Targett"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
index e2dc155846..6683acac15 100644
--- a/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
+++ b/ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x3253
 USB_PRODUCT = "Targett Module Clip w/Wrover"
 USB_MANUFACTURER = "Targett"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk
index d045cc2149..84c9787733 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80AC
 USB_PRODUCT = "FeatherS2"
 USB_MANUFACTURER = "UnexpectedMaker"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk
index a3ec63eaf3..cef7355051 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80B5
 USB_PRODUCT = "FeatherS2 Neo"
 USB_MANUFACTURER = "UnexpectedMaker"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
index d045cc2149..84c9787733 100644
--- a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x80AC
 USB_PRODUCT = "FeatherS2"
 USB_MANUFACTURER = "UnexpectedMaker"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
diff --git a/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk
index 91fa9dcbe3..ead608e6b2 100644
--- a/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk
+++ b/ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.mk
@@ -3,6 +3,8 @@ USB_PID = 0x8002
 USB_PRODUCT = "TinyS2"
 USB_MANUFACTURER = "UnexpectedMaker"
 
+IDF_TARGET = esp32s2
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ