diff --git a/.gitmodules b/.gitmodules
index b89769942af7f..7eaa0b04142b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.4.1
+	branch = circuitpython-v5.5.1
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git
diff --git a/lib/protomatter b/lib/protomatter
index 0bd9873153ab0..f83bac7e42107 160000
--- a/lib/protomatter
+++ b/lib/protomatter
@@ -1 +1 @@
-Subproject commit 0bd9873153ab0a91d6737c392622159a4515a2e5
+Subproject commit f83bac7e421077812523fddb83d3e25f29753315
diff --git a/lib/tinyusb b/lib/tinyusb
index 5fb3c09963bca..c1bf19ed6cf1e 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 5fb3c09963bca362e535788e289d4b3518da5973
+Subproject commit c1bf19ed6cf1eaa791f221c1bc5ce4b3d069f76d
diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index a063101991fdb..b6ddc27e4084c 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -8,6 +8,8 @@ include ../../py/circuitpy_mkenv.mk
 
 ifeq ($(IDF_TARGET),esp32s3)
 BT_IDF_TARGET = esp32c3
+else ifeq ($(IDF_TARGET),esp32c61)
+BT_IDF_TARGET = esp32c6
 else
 BT_IDF_TARGET = $(IDF_TARGET)
 endif
@@ -64,6 +66,7 @@ INC += \
 	-isystem esp-idf/components/esp_driver_i2s/include \
 	-isystem esp-idf/components/esp_driver_$(IDF_TARGET)/include \
 	-isystem esp-idf/components/esp_driver_ledc/include \
+	-isystem esp-idf/components/esp_driver_parlio/include \
 	-isystem esp-idf/components/esp_driver_pcnt/include \
 	-isystem esp-idf/components/esp_driver_rmt/include \
 	-isystem esp-idf/components/esp_driver_sdio/include \
@@ -149,6 +152,8 @@ CFLAGS += -DSTACK_CANARY_VALUE=0xa5a5a5a5
 REGISTRATION_FUNCTIONS = \
 	-u ld_include_highint_hdl \
 	-u __cxx_fatal_exception \
+	-u __cxx_init_dummy \
+	-u __cxa_guard_dummy \
 	-u esp_app_desc \
 	-u esp_timer_init_include_func \
 	-u uart_vfs_include_dev_init \
@@ -156,13 +161,17 @@ REGISTRATION_FUNCTIONS = \
 	-u __ubsan_include \
 	-u esp_system_include_startup_funcs \
 	-u esp_efuse_startup_include_func \
-	-u newlib_include_heap_impl \
-	-u newlib_include_syscalls_impl \
-	-u newlib_include_pthread_impl \
-	-u newlib_include_assert_impl \
-	-u newlib_include_init_funcs \
+	-u esp_libc_include_heap_impl \
+	-u esp_libc_include_reent_syscalls_impl \
+	-u esp_libc_include_syscalls_impl \
+	-u esp_libc_include_pthread_impl \
+	-u esp_libc_include_assert_impl \
+	-u esp_libc_include_getentropy_impl \
+	-u esp_libc_include_init_funcs \
+	-u esp_libc_init_funcs \
 	-u include_esp_phy_override \
-	-u vfs_include_syscalls_impl
+	-u vfs_include_syscalls_impl \
+	-u esp_vfs_include_nullfs_register
 
 
 #Debugging/Optimization
@@ -196,7 +205,6 @@ CFLAGS += $(INC) -Werror -Wall -std=gnu11 -Wl,--gc-sections $(BASE_CFLAGS) $(C_D
 # Most current ESPs have nano versions of newlib in ROM so we use them.
 ifneq ($(IDF_TARGET),esp32c6)
 	CFLAGS += --specs=nano.specs
-	LDFLAGS += -T$(IDF_TARGET).rom.newlib-nano.ld
 else
 	LDFLAGS += -T$(IDF_TARGET).rom.newlib-normal.ld
 endif
@@ -222,7 +230,6 @@ else ifeq ($(IDF_TARGET_ARCH),riscv)
 		-Trom.api.ld
 endif
 
-$(BUILD)/lib/tlsf/tlsf.o: CFLAGS += -Wno-cast-align
 
 LDFLAGS += $(CFLAGS) -Wl,-nostdlib -Wl,-Map=$@.map -Wl,-cref -Wl,--undefined=uxTopUsedPriority
 
@@ -244,7 +251,9 @@ LDFLAGS += \
 ifeq ($(IDF_TARGET),esp32)
 LDFLAGS += \
 	-Tesp32.rom.newlib-data.ld \
-	-Tesp32.rom.newlib-funcs.ld \
+	-Tesp32.rom.syscalls.ld \
+	-Tesp32.rom.libc-funcs.ld \
+	-Tesp32.rom.newlib-reent-funcs.ld \
 	-Tesp32.rom.spiflash_legacy.ld
 
 CHIP_COMPONENTS = \
@@ -254,7 +263,9 @@ else ifeq ($(IDF_TARGET),esp32c2)
 LDFLAGS += \
 	-Tesp32c2.rom.ble.ld \
 	-Tesp32c2.rom.heap.ld \
+	-Tesp32c2.rom.libc.ld \
 	-Tesp32c2.rom.newlib.ld \
+	-Tesp32c2.rom.newlib-nano.ld \
 	-Tesp32c2.rom.version.ld \
 	-Tesp32c2.rom.systimer.ld \
 	-Tesp32c2.rom.wdt.ld
@@ -267,6 +278,7 @@ CHIP_COMPONENTS = \
 else ifeq ($(IDF_TARGET),esp32c3)
 LDFLAGS += \
 	-Tesp32c3.rom.newlib.ld \
+	-Tesp32c3.rom.libc.ld \
 	-Tesp32c3.rom.version.ld \
 	-Tesp32c3.rom.eco3_bt_funcs.ld \
 	-Tesp32c3.rom.eco3.ld \
@@ -280,6 +292,7 @@ LDFLAGS += \
 	-Tesp32c6.rom.phy.ld \
 	-Tesp32c6.rom.pp.ld \
 	-Tesp32c6.rom.net80211.ld \
+	-Tesp32c6.rom.libc.ld \
 	-Tesp32c6.rom.newlib.ld \
 	-Tesp32c6.rom.coexist.ld \
 	-Tesp32c6.rom.heap.ld \
@@ -287,11 +300,29 @@ LDFLAGS += \
 	-Tesp32c6.rom.wdt.ld
 
 
+CHIP_COMPONENTS = \
+	esp_driver_tsens
+
+else ifeq ($(IDF_TARGET),esp32c61)
+LDFLAGS += \
+	-Tesp32c61.rom.phy.ld \
+	-Tesp32c61.rom.pp.ld \
+	-Tesp32c61.rom.net80211.ld \
+	-Tesp32c61.rom.libc.ld \
+	-Tesp32c61.rom.newlib.ld \
+	-Tesp32c61.rom.version.ld \
+	-Tesp32c61.rom.coexist.ld \
+	-Tesp32c61.rom.heap.ld \
+	-Tesp32c61.rom.systimer.ld \
+	-Tesp32c61.rom.wdt.ld
+
+
 CHIP_COMPONENTS = \
 	esp_driver_tsens
 
 else ifeq ($(IDF_TARGET),esp32p4)
 LDFLAGS += \
+	-Tesp32p4.rom.libc.ld \
 	-Tesp32p4.rom.newlib.ld \
 	-Tesp32p4.rom.systimer.ld \
 	-Tesp32p4.rom.wdt.ld
@@ -303,6 +334,7 @@ CHIP_COMPONENTS = \
 else ifeq ($(IDF_TARGET),esp32h2)
 LDFLAGS += \
 	-Tesp32h2.rom.heap.ld \
+	-Tesp32h2.rom.libc.ld \
 	-Tesp32h2.rom.newlib.ld \
 	-Tesp32h2.rom.systimer.ld \
 	-Tesp32h2.rom.wdt.ld
@@ -312,8 +344,9 @@ CHIP_COMPONENTS = \
 
 else ifeq ($(IDF_TARGET),esp32s2)
 LDFLAGS += \
+	-Tesp32s2.rom.libc-funcs.ld \
 	-Tesp32s2.rom.newlib-data.ld \
-	-Tesp32s2.rom.newlib-funcs.ld \
+	-Tesp32s2.rom.newlib-reent-funcs.ld \
 	-Tesp32s2.rom.spiflash_legacy.ld
 
 CHIP_COMPONENTS = \
@@ -322,6 +355,7 @@ CHIP_COMPONENTS = \
 
 else ifeq ($(IDF_TARGET),esp32s3)
 LDFLAGS += \
+	-Tesp32s3.rom.libc.ld \
 	-Tesp32s3.rom.newlib.ld \
 	-Tesp32s3.rom.version.ld \
 	-Tesp32s3.rom.systimer.ld \
@@ -350,6 +384,8 @@ else ifeq ($(IDF_TARGET),esp32c3)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C3
 else ifeq ($(IDF_TARGET),esp32c6)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C6
+else ifeq ($(IDF_TARGET),esp32c61)
+CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32C61
 else ifeq ($(IDF_TARGET),esp32p4)
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_ESP32P4
 else ifeq ($(IDF_TARGET),esp32h2)
@@ -662,7 +698,8 @@ ifneq ($(IDF_TARGET),esp32p4)
 	BINARY_BLOBS = esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libphy.a
 endif
 ifneq ($(CIRCUITPY_WIFI),0)
-	BINARY_BLOBS += esp-idf/components/esp_coex/lib/$(IDF_TARGET)/libcoexist.a $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS))
+	BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, $(BINARY_WIFI_BLOBS))
+	BINARY_BLOBS += esp-idf/components/esp_coex/lib/$(IDF_TARGET)/libcoexist.a
 	ifneq ($(IDF_TARGET),esp32c2)
 	BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/$(IDF_TARGET)/, libmesh.a libwapi.a)
 	endif
@@ -682,6 +719,7 @@ ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
 	BLE_IMPL_esp32c2 := libble
 	BLE_IMPL_esp32c3 := esp32c3
 	BLE_IMPL_esp32c6 := libble
+	BLE_IMPL_esp32c61 := libble
 	BLE_IMPL_esp32h2 := libble
 	BLE_IMPL = $(BLE_IMPL_$(IDF_TARGET))
 
@@ -700,8 +738,8 @@ ifneq ($(CIRCUITPY_BLEIO_NATIVE),0)
 
 	ifeq ($(BLE_IMPL),libble)
 	BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/libbtbb.a
-	ifeq ($(IDF_TARGET),esp32c6)
-		BINARY_BLOBS += esp-idf/components/bt/controller/lib_$(IDF_TARGET)/$(IDF_TARGET)-bt-lib/$(IDF_TARGET)/libble_app.a
+	ifeq ($(BT_IDF_TARGET),esp32c6)
+		BINARY_BLOBS += esp-idf/components/bt/controller/lib_$(BT_IDF_TARGET)/$(BT_IDF_TARGET)-bt-lib/$(IDF_TARGET)/libble_app.a
 	else
 		BINARY_BLOBS += esp-idf/components/bt/controller/lib_$(IDF_TARGET)/$(IDF_TARGET)-bt-lib/libble_app.a
 	endif
@@ -769,6 +807,8 @@ else ifeq ($(IDF_TARGET),esp32c3)
 BOOTLOADER_OFFSET = 0x0
 else ifeq ($(IDF_TARGET),esp32c6)
 BOOTLOADER_OFFSET = 0x0
+else ifeq ($(IDF_TARGET),esp32c61)
+BOOTLOADER_OFFSET = 0x0
 else ifeq ($(IDF_TARGET),esp32p4)
 BOOTLOADER_OFFSET = 0x2000
 else ifeq ($(IDF_TARGET),esp32s3)
@@ -782,7 +822,7 @@ endif
 
 IDF_CMAKE_TARGETS = \
 		bootloader/bootloader.bin \
-		esp-idf/esp_system/__ldgen_output_sections.ld \
+		__ldgen_output_sections.ld \
 		$(foreach component, $(ESP_IDF_COMPONENTS_LINK), esp-idf/$(component)/lib$(component).a)
 
 PARTITION_TABLE_OFFSET = 0x8000
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/sdkconfig b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/sdkconfig
index e962866216039..5fd531f274a6a 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/sdkconfig
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/sdkconfig
@@ -9,6 +9,18 @@
 #
 # end of LWIP
 
+#
+# Wireless Coexistence
+#
+# CONFIG_ESP_COEX_SW_COEXIST_ENABLE is not set
+# end of Wireless Coexistence
+
+#
+# LibC
+#
+# CONFIG_LIBC_OPTIMIZED_MISALIGNED_ACCESS is not set
+# end of LibC
+
 # end of Component config
 
 # end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/board.c b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/board.c
new file mode 100644
index 0000000000000..a3a9eec047145
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/board.c
@@ -0,0 +1,9 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/mpconfigboard.h b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/mpconfigboard.h
new file mode 100644
index 0000000000000..d901bfb37ba28
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/mpconfigboard.h
@@ -0,0 +1,15 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "ESP32-C61-DevKitC-1-N8R2"
+#define MICROPY_HW_MCU_NAME         "ESP32C61"
+
+#define DEFAULT_UART_BUS_RX         (&pin_GPIO10)
+#define DEFAULT_UART_BUS_TX         (&pin_GPIO11)
diff --git a/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/mpconfigboard.mk
new file mode 100644
index 0000000000000..1092a874a6868
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/mpconfigboard.mk
@@ -0,0 +1,13 @@
+CIRCUITPY_CREATOR_ID = 0x000C303A
+CIRCUITPY_CREATION_ID = 0x00C61001
+
+IDF_TARGET = esp32c61
+IDF_TARGET_ARCH = riscv
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 8MB
+
+CIRCUITPY_ESP_PSRAM_SIZE = 2MB
+CIRCUITPY_ESP_PSRAM_MODE = qio
+CIRCUITPY_ESP_PSRAM_FREQ = 80m
diff --git a/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/pins.c b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/pins.c
new file mode 100644
index 0000000000000..901e52166576b
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/pins.c
@@ -0,0 +1,48 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
+
+#include "shared-bindings/board/__init__.h"
+
+static const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_IO23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_IO24), MP_ROM_PTR(&pin_GPIO24) },
+    { MP_ROM_QSTR(MP_QSTR_IO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_IO28), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_IO29), MP_ROM_PTR(&pin_GPIO29) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO8) },
+
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO10) },
+
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/sdkconfig b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/sdkconfig
new file mode 100644
index 0000000000000..e962866216039
--- /dev/null
+++ b/ports/espressif/boards/espressif_esp32c61_devkitc_1_n8r2/sdkconfig
@@ -0,0 +1,14 @@
+#
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
+# LWIP
+#
+# end of LWIP
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
index 8e3e46785f2e7..97ad3b2a94255 100644
--- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c
+++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c
@@ -14,10 +14,12 @@
 
 #include "esp_sleep.h"
 #include "hal/gpio_ll.h"
+#include "driver/gpio.h"
 #include "esp_debug_helpers.h"
 
 #ifdef SOC_PM_SUPPORT_EXT0_WAKEUP
 #include "soc/rtc_cntl_reg.h"
+#include "soc/rtc_io_reg.h"
 #endif
 
 #include "driver/rtc_io.h"
@@ -358,38 +360,40 @@ void alarm_pin_pinalarm_set_alarms(bool deep_sleep, size_t n_alarms, const mp_ob
     if (gpio_isr_register(gpio_interrupt, NULL, 0, &gpio_interrupt_handle) != ESP_OK) {
         mp_raise_ValueError(MP_ERROR_TEXT("Can only alarm on RTC IO from deep sleep."));
     }
-    for (size_t i = 0; i < 64; i++) {
-        uint64_t mask = 1ull << i;
+    for (gpio_num_t pin = 0; pin < SOC_GPIO_PIN_COUNT; pin++) {
+        uint64_t mask = 1ULL << pin;
         bool high = (high_alarms & mask) != 0;
         bool low = (low_alarms & mask) != 0;
         bool pull = (pull_pins & mask) != 0;
         if (!(high || low)) {
             continue;
         }
-        if (rtc_gpio_is_valid_gpio(i)) {
+        if (rtc_gpio_is_valid_gpio(pin)) {
             #ifdef SOC_PM_SUPPORT_RTC_PERIPH_PD
-            rtc_gpio_deinit(i);
+            rtc_gpio_deinit(pin);
             #endif
         }
-        gpio_int_type_t interrupt_mode = GPIO_INTR_DISABLE;
-        gpio_pull_mode_t pull_mode = GPIO_FLOATING;
+        gpio_set_direction(pin, GPIO_MODE_INPUT);
+        if (pull) {
+            if (high) {
+                ESP_ERROR_CHECK(gpio_set_pull_mode(pin, GPIO_PULLDOWN_ONLY));
+            } else {
+                ESP_ERROR_CHECK(gpio_set_pull_mode(pin, GPIO_PULLUP_ONLY));
+            }
+        } else {
+            ESP_ERROR_CHECK(gpio_set_pull_mode(pin, GPIO_FLOATING));
+        }
+        gpio_int_type_t intr = GPIO_INTR_DISABLE;
         if (high) {
-            interrupt_mode = GPIO_INTR_HIGH_LEVEL;
-            pull_mode = GPIO_PULLDOWN_ONLY;
+            intr = GPIO_INTR_HIGH_LEVEL;
         }
         if (low) {
-            interrupt_mode = GPIO_INTR_LOW_LEVEL;
-            pull_mode = GPIO_PULLUP_ONLY;
-        }
-        gpio_set_direction(i, GPIO_MODE_DEF_INPUT);
-        PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[i], PIN_FUNC_GPIO);
-        if (pull) {
-            gpio_set_pull_mode(i, pull_mode);
+            intr = GPIO_INTR_LOW_LEVEL;
         }
-        never_reset_pin_number(i);
-        // Sets interrupt type and wakeup bits.
-        gpio_wakeup_enable(i, interrupt_mode);
-        gpio_intr_enable(i);
+        never_reset_pin_number(pin);
+        gpio_wakeup_enable(pin, intr);
+        gpio_set_intr_type(pin, intr);
+        gpio_intr_enable(pin);
     }
     // Wait for any pulls to settle.
     mp_hal_delay_ms(50);
diff --git a/ports/espressif/common-hal/analogbufio/BufferedIn.c b/ports/espressif/common-hal/analogbufio/BufferedIn.c
index aac7ad28daf25..20c5c060574aa 100644
--- a/ports/espressif/common-hal/analogbufio/BufferedIn.c
+++ b/ports/espressif/common-hal/analogbufio/BufferedIn.c
@@ -33,7 +33,7 @@
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
 #define ADC_RESULT_BYTE     2
 #define ADC_CONV_LIMIT_EN   0
-#elif defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32P4)
+#elif defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32P4) || defined(CONFIG_IDF_TARGET_ESP32C61)
 #define ADC_RESULT_BYTE     4
 #define ADC_CONV_LIMIT_EN   0
 #elif defined(CONFIG_IDF_TARGET_ESP32S3)
diff --git a/ports/espressif/common-hal/analogio/AnalogIn.c b/ports/espressif/common-hal/analogio/AnalogIn.c
index 16340e91ac91c..34cd5b846cf22 100644
--- a/ports/espressif/common-hal/analogio/AnalogIn.c
+++ b/ports/espressif/common-hal/analogio/AnalogIn.c
@@ -32,6 +32,8 @@
 #define DATA_WIDTH          ADC_BITWIDTH_12
 #elif defined(CONFIG_IDF_TARGET_ESP32C6)
 #define DATA_WIDTH          ADC_BITWIDTH_12
+#elif defined(CONFIG_IDF_TARGET_ESP32C61)
+#define DATA_WIDTH          ADC_BITWIDTH_12
 #elif defined(CONFIG_IDF_TARGET_ESP32P4)
 #define DATA_WIDTH          ADC_BITWIDTH_12
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
@@ -86,10 +88,8 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     adc_cali_scheme_ver_t supported_schemes;
     adc_cali_check_scheme(&supported_schemes);
-    #ifndef CONFIG_IDF_TARGET_ESP32P4
     adc_cali_scheme_ver_t calibration_scheme = 0;
     adc_cali_handle_t calibration;
-    #endif
     #if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
     adc_cali_curve_fitting_config_t config = {
         .unit_id = self->pin->adc_index,
@@ -137,11 +137,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     // This corrects non-linear regions of the ADC range with a LUT, so it's a better reading than raw
     int voltage;
-    #ifdef CONFIG_IDF_TARGET_ESP32P4
-    voltage = 0;
-    #else
     adc_cali_raw_to_voltage(calibration, adc_reading, &voltage);
-    #endif
 
     #if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
     if (calibration_scheme == ADC_CALI_SCHEME_VER_CURVE_FITTING) {
diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c
index ed537419405b3..e4272ba1ff5ff 100644
--- a/ports/espressif/common-hal/digitalio/DigitalInOut.c
+++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c
@@ -11,8 +11,11 @@
 #include "hal/gpio_hal.h"
 
 static bool _pin_is_input(uint8_t pin_number) {
-    const uint32_t iomux = READ_PERI_REG(GPIO_PIN_MUX_REG[pin_number]);
-    return (iomux & FUN_IE) != 0;
+    gpio_io_config_t config;
+    if (gpio_get_io_config((gpio_num_t)pin_number, &config) != ESP_OK) {
+        return false;
+    }
+    return config.ie;
 }
 
 void digitalio_digitalinout_preserve_for_deep_sleep(size_t n_dios, digitalio_digitalinout_obj_t *preserve_dios[]) {
@@ -113,10 +116,12 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
     digitalio_digitalinout_obj_t *self) {
-    if (GPIO_HAL_GET_HW(GPIO_PORT_0)->pin[self->pin->number].pad_driver == 1) {
+    gpio_io_config_t config;
+    if (gpio_get_io_config((gpio_num_t)self->pin->number, &config) != ESP_OK) {
+        // Should it fail closed or open?
         return DRIVE_MODE_OPEN_DRAIN;
     }
-    return DRIVE_MODE_PUSH_PULL;
+    return config.od ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
 }
 
 digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
@@ -134,11 +139,10 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
     digitalio_digitalinout_obj_t *self) {
-    gpio_num_t gpio_num = self->pin->number;
-    if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PU)) {
-        return PULL_UP;
-    } else if (REG_GET_BIT(GPIO_PIN_MUX_REG[gpio_num], FUN_PD)) {
-        return PULL_DOWN;
+    gpio_io_config_t config;
+    if (gpio_get_io_config((gpio_num_t)self->pin->number, &config) != ESP_OK) {
+        // Should it fail closed or open?
+        return PULL_NONE;
     }
-    return PULL_NONE;
+    return config.pd ? PULL_DOWN : PULL_UP;
 }
diff --git a/ports/espressif/common-hal/espnow/ESPNow.c b/ports/espressif/common-hal/espnow/ESPNow.c
index 79bded96fb41d..ae11db250321c 100644
--- a/ports/espressif/common-hal/espnow/ESPNow.c
+++ b/ports/espressif/common-hal/espnow/ESPNow.c
@@ -56,7 +56,7 @@ typedef struct {
 // Callback triggered when a sent packet is acknowledged by the peer (or not).
 // Just count the number of responses and number of failures.
 // These are used in the send() logic.
-static void send_cb(const uint8_t *mac, esp_now_send_status_t status) {
+static void send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status) {
     espnow_obj_t *self = MP_STATE_PORT(espnow_singleton);
     if (status == ESP_NOW_SEND_SUCCESS) {
         self->send_success++;
diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c
index 70912afb545b4..922cde763e363 100644
--- a/ports/espressif/common-hal/microcontroller/Pin.c
+++ b/ports/espressif/common-hal/microcontroller/Pin.c
@@ -146,6 +146,29 @@ static const uint64_t pin_mask_reset_forbidden =
     #endif
     #endif // ESP32C6
 
+    #if defined(CONFIG_IDF_TARGET_ESP32C61)
+    // Never ever reset pins used to communicate with SPI flash.
+    GPIO_SEL_15 |        // SPICS0  (flash CS#)
+    GPIO_SEL_16 |        // SPIQ    (MISO/SIO1)
+    GPIO_SEL_17 |        // SPIWP   (WP#/SIO2)
+    GPIO_SEL_19 |        // SPIHD   (HOLD#/SIO3)
+    GPIO_SEL_20 |        // SPICLK  (CLK)
+    GPIO_SEL_21 |        // SPID    (MOSI/SIO0)
+    #if CIRCUITPY_ESP_USB_SERIAL_JTAG
+    // Never ever reset serial/JTAG communication pins.
+    GPIO_SEL_12 |         // USB D-
+    GPIO_SEL_13 |         // USB D+
+    #endif
+    #if defined(CONFIG_SPIRAM)
+    GPIO_SEL_14 |        // SPICS1 (PSRAM CS#); keep if PSRAM in use
+    #endif
+    #if defined(CONFIG_ESP_CONSOLE_UART_DEFAULT) && CONFIG_ESP_CONSOLE_UART_DEFAULT && CONFIG_ESP_CONSOLE_UART_NUM == 0
+    // Never reset debug UART/console pins.
+    GPIO_SEL_10 |
+    GPIO_SEL_11 |
+    #endif
+    #endif // ESP32C6
+
     #if defined(CONFIG_IDF_TARGET_ESP32H2)
     // Never ever reset pins used to communicate with the in-package SPI flash.
     GPIO_SEL_15 |
@@ -370,9 +393,8 @@ void reset_all_pins(void) {
     gpio_deep_sleep_hold_dis();
     #endif
 
-    for (uint8_t i = 0; i < GPIO_PIN_COUNT; i++) {
-        uint32_t iomux_address = GPIO_PIN_MUX_REG[i];
-        if (iomux_address == 0 ||
+    for (gpio_num_t i = 0; i < SOC_GPIO_PIN_COUNT; i++) {
+        if (!GPIO_IS_VALID_GPIO(i) ||
             _never_reset(i) ||
             _skip_reset_once(i) ||
             _preserved_pin(i)) {
diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c
index 8a6a14c0236f5..0056465f1c5cd 100644
--- a/ports/espressif/common-hal/microcontroller/Processor.c
+++ b/ports/espressif/common-hal/microcontroller/Processor.c
@@ -59,7 +59,7 @@ uint32_t common_hal_mcu_processor_get_frequency(void) {
 // If the requested frequency is not supported by the hardware, return the next lower supported frequency
 static uint32_t get_valid_cpu_frequency(uint32_t requested_freq_mhz) {
 
-    #if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+    #if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32C61)
     uint32_t valid_cpu_frequencies[] = {20, 40, 80, 160};
     #elif defined(CONFIG_IDF_TARGET_ESP32C2)
     uint32_t valid_cpu_frequencies[] = {20, 40, 80, 120};
@@ -126,6 +126,8 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
     uint32_t mac_address_part = REG_READ(EFUSE_RD_MAC_SYS_0_REG);
     #elif defined(CONFIG_IDF_TARGET_ESP32C2)
     uint32_t mac_address_part = REG_READ(EFUSE_RD_BLK2_DATA0_REG);
+    #elif defined(CONFIG_IDF_TARGET_ESP32C61)
+    uint32_t mac_address_part = REG_READ(EFUSE_RD_MAC_SYS0_REG);
     #else
     uint32_t mac_address_part = REG_READ(EFUSE_RD_MAC_SPI_SYS_0_REG);
     #endif
@@ -145,6 +147,8 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) {
     mac_address_part = REG_READ(EFUSE_RD_MAC_SYS_1_REG);
     #elif defined(CONFIG_IDF_TARGET_ESP32C2)
     mac_address_part = REG_READ(EFUSE_RD_BLK2_DATA1_REG);
+    #elif defined(CONFIG_IDF_TARGET_ESP32C61)
+    mac_address_part = REG_READ(EFUSE_RD_MAC_SYS1_REG);
     #else
     mac_address_part = REG_READ(EFUSE_RD_MAC_SPI_SYS_1_REG);
     #endif
diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c
index 918366b8933c4..d23afce4d999e 100644
--- a/ports/espressif/common-hal/microcontroller/__init__.c
+++ b/ports/espressif/common-hal/microcontroller/__init__.c
@@ -36,6 +36,9 @@
 #elif defined(CONFIG_IDF_TARGET_ESP32C6)
 #include "soc/lp_aon_reg.h"
 #include "esp32c6/rom/rtc.h"
+#elif defined(CONFIG_IDF_TARGET_ESP32C61)
+#include "soc/lp_aon_reg.h"
+#include "esp32c61/rom/rtc.h"
 #elif defined(CONFIG_IDF_TARGET_ESP32P4)
 #include "esp32p4/rom/rtc.h"
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
@@ -83,7 +86,7 @@ void common_hal_mcu_enable_interrupts(void) {
 void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
     switch (runmode) {
         case RUNMODE_UF2:
-            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32C61)
             mp_arg_error_invalid(MP_QSTR_run_mode);
             #else
             // 0x11F2 is APP_REQUEST_UF2_RESET_HINT & is defined by TinyUF2
diff --git a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
index 7721b5e197f49..52c4b67bf4efe 100644
--- a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
+++ b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
@@ -18,7 +18,7 @@
 #include "common-hal/microcontroller/Pin.h"
 #include "py/runtime.h"
 
-#include "driver/gpio.h"
+#include <driver/gpio.h>
 
 /*
  *  Current pin limitations for ESP32-S2 ParallelBus:
diff --git a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h
index 4724ba7231a4e..114a1e527a6d5 100644
--- a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h
+++ b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.h
@@ -8,7 +8,7 @@
 
 #include "common-hal/digitalio/DigitalInOut.h"
 
-#include "esp-idf/components/esp_lcd/include/esp_lcd_panel_io.h"
+#include <esp-idf/components/esp_lcd/include/esp_lcd_panel_io.h>
 
 typedef struct {
     mp_obj_base_t base;
diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
index 1a4c014bfbc5b..0eacd2bab3ec0 100644
--- a/ports/espressif/common-hal/wifi/__init__.c
+++ b/ports/espressif/common-hal/wifi/__init__.c
@@ -146,8 +146,8 @@ void common_hal_wifi_init(bool user_initiated) {
     common_hal_wifi_radio_obj.base.type = &wifi_radio_type;
 
     if (!wifi_ever_inited) {
-        ESP_ERROR_CHECK(esp_netif_init());
         ESP_ERROR_CHECK(esp_event_loop_create_default());
+        ESP_ERROR_CHECK(esp_netif_init());
         wifi_ever_inited = true;
     }
 
@@ -175,6 +175,7 @@ void common_hal_wifi_init(bool user_initiated) {
         &self->handler_instance_got_ip));
 
     wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
+    esp_err_t result = esp_wifi_init(&config);
     #ifdef CONFIG_ESP32_WIFI_NVS_ENABLED
     // Generally we don't use this because we store ssid and passwords ourselves in the filesystem.
     esp_err_t err = nvs_flash_init();
@@ -185,8 +186,10 @@ void common_hal_wifi_init(bool user_initiated) {
         err = nvs_flash_init();
     }
     ESP_ERROR_CHECK(err);
+    ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
+    #else
+    ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM));
     #endif
-    esp_err_t result = esp_wifi_init(&config);
     if (result == ESP_ERR_NO_MEM) {
         if (gc_alloc_possible()) {
             mp_raise_msg(&mp_type_MemoryError, MP_ERROR_TEXT("Failed to allocate Wifi memory"));
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index f50ec8ecdb31f..f4fddd2d05b44 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit f50ec8ecdb31f681e6a778f145de95f849c1089d
+Subproject commit f4fddd2d05b44d1d606b546b596d17de0a73e9eb
diff --git a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
index a9c8e34e54706..368ba81bb4aa7 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults
@@ -7,6 +7,21 @@
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 # end of Compiler options
 
+# Bootloader config
+#
+#
+# Log
+#
+#
+# Format
+#
+CONFIG_BOOTLOADER_LOG_COLORS=y
+# end of Format
+
+# end of Log
+
+# end of Bootloader config
+
 #
 # Component config
 #
@@ -19,6 +34,17 @@ CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
 # CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
 # end of ESP System Settings
 
+#
+# Log
+#
+#
+# Format
+#
+CONFIG_LOG_COLORS=y
+# end of Format
+
+# end of Log
+
 # end of Component config
 
 # end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults
index 85dde905f3caa..63f42cac95244 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c6.defaults
@@ -49,6 +49,12 @@ CONFIG_ESP_PHY_ENABLE_USB=y
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4
 # end of Wi-Fi
 
+#
+# mbedTLS
+#
+# CONFIG_MBEDTLS_HARDWARE_SHA is not set
+# end of mbedTLS
+
 # end of Component config
 
 # end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c61.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c61.defaults
new file mode 100644
index 0000000000000..85dde905f3caa
--- /dev/null
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c61.defaults
@@ -0,0 +1,54 @@
+#
+# Espressif IoT Development Framework Configuration
+#
+#
+# Component config
+#
+#
+# Bluetooth
+#
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+#
+# NimBLE Options
+#
+CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
+CONFIG_BT_NIMBLE_NVS_PERSIST=y
+#
+# Memory Settings
+#
+CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=20
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE=70
+# end of Memory Settings
+
+CONFIG_BT_NIMBLE_EXT_ADV=y
+# end of NimBLE Options
+
+# end of Bluetooth
+
+#
+# Driver Configurations
+#
+#
+# PCNT Configuration
+#
+CONFIG_PCNT_CTRL_FUNC_IN_IRAM=y
+# end of PCNT Configuration
+
+# end of Driver Configurations
+
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
+#
+# Wi-Fi
+#
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4
+# end of Wi-Fi
+
+# end of Component config
+
+# end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
index 5c748bd0e6f02..101f90f9fa4fe 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults
@@ -55,7 +55,7 @@ CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_TYPE_FSM=y
 CONFIG_ULP_COPROC_TYPE_RISCV=y  # Note: enabling both ULPs simultaneously only works due to a modification of adafruit/esp-idf
                                 # (see adafruit/esp-idf/pull/16) until espressif/esp-idf/issues/12999 is fixed.
-CONFIG_ULP_COPROC_RESERVE_MEM=8176
+CONFIG_ULP_COPROC_RESERVE_MEM=8144
 # end of Ultra Low Power (ULP) Co-processor
 
 #
diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
index fe3c3e0a2da88..2553c648018bd 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults
@@ -95,7 +95,7 @@ CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_TYPE_FSM=y
 CONFIG_ULP_COPROC_TYPE_RISCV=y  # Note: enabling both ULPs simultaneously only works due to a modification of adafruit/esp-idf
                                 # (see adafruit/esp-idf/pull/16) until espressif/esp-idf/issues/12999 is fixed.
-CONFIG_ULP_COPROC_RESERVE_MEM=8176
+CONFIG_ULP_COPROC_RESERVE_MEM=8144
 # end of Ultra Low Power (ULP) Co-processor
 
 # end of Component config
diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults
index 16f5b990386a1..0da23e8122762 100644
--- a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults
@@ -38,6 +38,24 @@ CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
 CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 # end of Log output
 
+#
+# Log
+#
+#
+# Log Level
+#
+#
+# Level Settings
+#
+# CONFIG_LOG_DYNAMIC_LEVEL_CONTROL is not set
+CONFIG_LOG_TAG_LEVEL_IMPL_NONE=y
+# CONFIG_LOG_TAG_LEVEL_IMPL_CACHE_AND_LINKED_LIST is not set
+# end of Level Settings
+
+# end of Log Level
+
+# end of Log
+
 # end of Component config
 
 # end of Espressif IoT Development Framework Configuration
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
index dd766675136d9..5c4d6a31a62c1 100644
--- a/ports/espressif/esp-idf-config/sdkconfig.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -20,6 +20,12 @@ CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM=y
 CONFIG_GPTIMER_ISR_IRAM_SAFE=y
 # end of GPTimer Configuration
 
+#
+# Touch Configuration
+#
+CONFIG_TOUCH_SUPPRESS_DEPRECATE_WARN=y
+# end of Touch Configuration
+
 # end of Driver Configurations
 
 #
@@ -59,6 +65,13 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384
 CONFIG_FREERTOS_HZ=1000
 # end of Kernel
 
+#
+# LibC
+#
+# end of LWIP
+CONFIG_LIBC_OPTIMIZED_MISALIGNED_ACCESS=y
+# end of LibC
+
 #
 # LWIP
 #
diff --git a/ports/espressif/mpconfigport.h b/ports/espressif/mpconfigport.h
index 712eb67f1f42a..031676cf4d8ae 100644
--- a/ports/espressif/mpconfigport.h
+++ b/ports/espressif/mpconfigport.h
@@ -27,7 +27,7 @@
 
 // Nearly all boards have this because it is used to enter the ROM bootloader.
 #ifndef CIRCUITPY_BOOT_BUTTON
-  #if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2)
+  #if defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2) || defined(CONFIG_IDF_TARGET_ESP32C61)
     #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)
   #elif !defined(CONFIG_IDF_TARGET_ESP32)
     #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
index 42bf3418f9639..f133e86c6e068 100644
--- a/ports/espressif/mpconfigport.mk
+++ b/ports/espressif/mpconfigport.mk
@@ -17,6 +17,9 @@ CROSS_COMPILE = riscv32-esp-elf-
 else ifeq ($(IDF_TARGET),esp32c6)
 IDF_TARGET_ARCH = riscv
 CROSS_COMPILE = riscv32-esp-elf-
+else ifeq ($(IDF_TARGET),esp32c61)
+IDF_TARGET_ARCH = riscv
+CROSS_COMPILE = riscv32-esp-elf-
 else ifeq ($(IDF_TARGET),esp32h2)
 IDF_TARGET_ARCH = riscv
 CROSS_COMPILE = riscv32-esp-elf-
@@ -54,6 +57,10 @@ CIRCUITPY_HASHLIB_MBEDTLS_ONLY = 0
 
 CIRCUITPY_PORT_SERIAL = 1
 
+CIRCUITPY_LIB_TLSF = 0
+
+CIRCUITPY_LIBC_STRING0 = 0
+
 # These modules are implemented in ports/<port>/common-hal:
 CIRCUITPY__EVE ?= 1
 CIRCUITPY_ALARM ?= 1
@@ -199,6 +206,45 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0
 CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
 
+#### esp32c6 ##########################################################
+else ifeq ($(IDF_TARGET),esp32c61)
+# Modules
+CIRCUITPY_ESPCAMERA = 0
+CIRCUITPY_ESPULP = 0
+CIRCUITPY_MEMORYMAP = 0
+CIRCUITPY_RGBMATRIX = 0
+
+# No DAC
+CIRCUITPY_AUDIOIO = 0
+
+# No space for this
+CIRCUITPY_AUDIOBUSIO = 0
+
+# No I80 support from the IDF
+CIRCUITPY_PARALLELDISPLAYBUS = 0
+
+# No SDMMC
+CIRCUITPY_SDIOIO = 0
+
+CIRCUITPY_TOUCHIO ?= 1
+CIRCUITPY_TOUCHIO_USE_NATIVE = 0
+# Features
+CIRCUITPY_USB_DEVICE = 0
+CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
+
+# No TWAI on chip
+CIRCUITPY_CANIO = 0
+
+# No RMT on chip
+CIRCUITPY_NEOPIXEL_WRITE = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_RGBMATRIX = 0
+
+# No PCNT on chip
+CIRCUITPY_COUNTIO = 0
+CIRCUITPY_ROTARYIO = 0
+CIRCUITPY_FREQUENCYIO = 0
+
 #### esp32h2 ##########################################################
 else ifeq ($(IDF_TARGET),esp32h2)
 # Modules
diff --git a/ports/espressif/peripherals/esp32c61/pins.c b/ports/espressif/peripherals/esp32c61/pins.c
new file mode 100644
index 0000000000000..a32e1e8da9856
--- /dev/null
+++ b/ports/espressif/peripherals/esp32c61/pins.c
@@ -0,0 +1,38 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2021 microDev
+//
+// SPDX-License-Identifier: MIT
+
+#include "peripherals/pins.h"
+
+const mcu_pin_obj_t pin_GPIO0 = PIN(0, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO1 = PIN(1, ADC_UNIT_1, ADC_CHANNEL_0, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO2 = PIN(2, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO3 = PIN(3, ADC_UNIT_1, ADC_CHANNEL_1, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO4 = PIN(4, ADC_UNIT_1, ADC_CHANNEL_2, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO5 = PIN(5, ADC_UNIT_1, ADC_CHANNEL_3, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO6 = PIN(6, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO7 = PIN(7, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO8 = PIN(8, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO9 = PIN(9, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO10 = PIN(10, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO11 = PIN(11, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO12 = PIN(12, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO13 = PIN(13, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO14 = PIN(14, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO15 = PIN(15, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO16 = PIN(16, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO17 = PIN(17, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO18 = PIN(18, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO19 = PIN(19, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO20 = PIN(20, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO21 = PIN(21, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO22 = PIN(22, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO23 = PIN(23, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO24 = PIN(24, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO25 = PIN(25, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO26 = PIN(26, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO27 = PIN(27, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO28 = PIN(28, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
+const mcu_pin_obj_t pin_GPIO29 = PIN(29, NO_ADC, NO_ADC_CHANNEL, NO_TOUCH_CHANNEL);
diff --git a/ports/espressif/peripherals/esp32c61/pins.h b/ports/espressif/peripherals/esp32c61/pins.h
new file mode 100644
index 0000000000000..908c9fe29f0e2
--- /dev/null
+++ b/ports/espressif/peripherals/esp32c61/pins.h
@@ -0,0 +1,72 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2023 Scott Shawcroft for Adafruit Industries LLC
+//
+// SPDX-License-Identifier: MIT
+
+// DO NOT include this file directly.
+// Use shared-bindings/microcontroller/Pin.h instead.
+// This ensures that all necessary includes are already included.
+
+#pragma once
+
+#define GPIO0_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO0;
+#define GPIO1_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO1;
+#define GPIO2_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO2;
+#define GPIO3_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO3;
+#define GPIO4_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO4;
+#define GPIO5_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO5;
+#define GPIO6_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO6;
+#define GPIO7_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO7;
+#define GPIO8_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO8;
+#define GPIO9_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO9;
+#define GPIO10_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO10;
+#define GPIO11_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO11;
+#define GPIO12_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO12;
+#define GPIO13_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO13;
+#define GPIO14_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO14;
+#define GPIO15_EXISTS 0
+extern const mcu_pin_obj_t pin_GPIO15;
+#define GPIO16_EXISTS 0
+extern const mcu_pin_obj_t pin_GPIO16;
+#define GPIO17_EXISTS 0
+extern const mcu_pin_obj_t pin_GPIO17;
+#define GPIO18_EXISTS 0
+extern const mcu_pin_obj_t pin_GPIO18;
+#define GPIO19_EXISTS 0
+extern const mcu_pin_obj_t pin_GPIO19;
+#define GPIO20_EXISTS 0
+extern const mcu_pin_obj_t pin_GPIO20;
+#define GPIO21_EXISTS 0
+extern const mcu_pin_obj_t pin_GPIO21;
+#define GPIO22_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO22;
+#define GPIO23_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO23;
+#define GPIO24_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO24;
+#define GPIO25_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO25;
+#define GPIO26_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO26;
+#define GPIO27_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO27;
+#define GPIO28_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO28;
+#define GPIO29_EXISTS 1
+extern const mcu_pin_obj_t pin_GPIO29;
diff --git a/ports/espressif/peripherals/pins.h b/ports/espressif/peripherals/pins.h
index f89855e308f59..bbe42be1bcae2 100644
--- a/ports/espressif/peripherals/pins.h
+++ b/ports/espressif/peripherals/pins.h
@@ -14,7 +14,7 @@
 
 #include "components/hal/include/hal/gpio_types.h"
 #include "components/hal/include/hal/adc_types.h"
-#include "components/hal/include/hal/touch_sensor_types.h"
+#include "components/hal/include/hal/touch_sensor_legacy_types.h"
 
 typedef struct {
     mp_obj_base_t base;
@@ -52,6 +52,8 @@ extern const mp_obj_type_t mcu_pin_type;
 #include "esp32c3/pins.h"
 #elif defined(CONFIG_IDF_TARGET_ESP32C6)
 #include "esp32c6/pins.h"
+#elif defined(CONFIG_IDF_TARGET_ESP32C61)
+#include "esp32c61/pins.h"
 #elif defined(CONFIG_IDF_TARGET_ESP32P4)
 #include "esp32p4/pins.h"
 #elif defined(CONFIG_IDF_TARGET_ESP32H2)
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
index 48ae29ab4f927..72c92c98baea2 100644
--- a/ports/espressif/supervisor/port.c
+++ b/ports/espressif/supervisor/port.c
@@ -216,6 +216,11 @@ static void _never_reset_spi_ram_flash(void) {
         never_reset_pin_number(bootloader_flash_get_wp_pin());
     }
     #endif // CONFIG_IDF_TARGET_ESP32
+    #if defined(CONFIG_IDF_TARGET_ESP32C61)
+    #if defined(CONFIG_SPIRAM)
+    common_hal_never_reset_pin(&pin_GPIO14);
+    #endif
+    #endif
 }
 
 safe_mode_t port_init(void) {
@@ -271,7 +276,7 @@ safe_mode_t port_init(void) {
     common_hal_never_reset_pin(&pin_GPIO40);
     common_hal_never_reset_pin(&pin_GPIO41);
     common_hal_never_reset_pin(&pin_GPIO42);
-    #elif defined(CONFIG_IDF_TARGET_ESP32P4)
+    #elif defined(CONFIG_IDF_TARGET_ESP32P4) || defined(CONFIG_IDF_TARGET_ESP32C61)
     common_hal_never_reset_pin(&pin_GPIO3);
     common_hal_never_reset_pin(&pin_GPIO4);
     common_hal_never_reset_pin(&pin_GPIO5);
diff --git a/ports/espressif/supervisor/usb.c b/ports/espressif/supervisor/usb.c
index 612abaa808ae2..274542ef22a7d 100644
--- a/ports/espressif/supervisor/usb.c
+++ b/ports/espressif/supervisor/usb.c
@@ -54,31 +54,6 @@ static void usb_device_task(void *param) {
         vTaskDelay(1);
     }
 }
-
-/**
- * Callback invoked when received an "wanted" char.
- * @param itf           Interface index (for multiple cdc interfaces)
- * @param wanted_char   The wanted char (set previously)
- */
-void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
-    (void)itf;  // not used
-    // CircuitPython's VM is run in a separate FreeRTOS task from TinyUSB.
-    // So, we must notify the other task when a CTRL-C is received.
-    port_wake_main_task();
-    // Workaround for using shared/runtime/interrupt_char.c
-    // Compare mp_interrupt_char with wanted_char and ignore if not matched
-    if (mp_interrupt_char == wanted_char) {
-        tud_cdc_read_flush();    // flush read fifo
-        mp_sched_keyboard_interrupt();
-    }
-}
-
-void tud_cdc_rx_cb(uint8_t itf) {
-    (void)itf;
-    // Workaround for "press any key to enter REPL" response being delayed on espressif.
-    // Wake main task when any key is pressed.
-    port_wake_main_task();
-}
 #endif // CIRCUITPY_USB_DEVICE
 
 void init_usb_hardware(void) {
diff --git a/ports/espressif/tools/build_memory_info.py b/ports/espressif/tools/build_memory_info.py
index 9a3c55501388e..0cf609c4d63f4 100644
--- a/ports/espressif/tools/build_memory_info.py
+++ b/ports/espressif/tools/build_memory_info.py
@@ -61,6 +61,12 @@
         ("LP SRAM", (0x5000_0000,), 16 * 1024),
         ("HP SRAM", (0x4080_0000,), 512 * 1024),
     ],
+    "esp32c61": [
+        # Name, Start, Length
+        ("LP SRAM", (0x5000_0000,), 16 * 1024),
+        ("HP SRAM", (0x4080_0000,), 320 * 1024),
+        ("PSRAM", (0x4200_0000,), 2 * 1024 * 1024),
+    ],
     "esp32h2": [
         # Name, Start, Length
         ("LP SRAM", (0x5000_0000,), 4 * 1024),
diff --git a/ports/espressif/tools/decode_backtrace.py b/ports/espressif/tools/decode_backtrace.py
index 024e636207ec8..16cef9e0822cc 100644
--- a/ports/espressif/tools/decode_backtrace.py
+++ b/ports/espressif/tools/decode_backtrace.py
@@ -12,20 +12,41 @@
 board = sys.argv[1]
 print(board)
 
+elfs = [
+    f"build-{board}/firmware.elf",
+    # Add additional ELF files here such as the ROM ELF files from:
+    # https://github.com/espressif/esp-rom-elfs/releases
+    # "/home/tannewt/Downloads/esp-rom-elfs-20241011/esp32c6_rev0_rom.elf",
+]
+
 while True:
+    print('"Backtrace:" or "Stack memory:". CTRL-D to finish multiline paste')
     addresses = input("? ")
     if addresses.startswith("Backtrace:"):
         addresses = addresses[len("Backtrace:") :]
-    if addresses.startswith("Stack memory:"):
-        addresses = addresses[len("Stack memory:") :]
-    addresses = addresses.strip().split()
-    addresses = [address.split(":")[0] for address in addresses]
+        addresses = addresses.strip().split()
+        addresses = [address.split(":")[0] for address in addresses]
+    elif addresses.startswith("Stack memory:"):
+        addresses = []
+        extra_lines = sys.stdin.readlines()
+        for line in extra_lines:
+            if not line.strip():
+                continue
+            addresses.extend(line.split(":")[1].strip().split())
     for address in addresses:
-        result = subprocess.run(
-            ["xtensa-esp32s2-elf-addr2line", "-aipfe", "build-{}/firmware.elf".format(board)]
-            + [address],
-            capture_output=True,
-        )
-        stdout = result.stdout.decode("utf-8")
-        if "?? ??" not in stdout:
-            print(stdout.strip())
+        if address == "0xa5a5a5a5":
+            # Skip stack fill value.
+            continue
+        for elf in elfs:
+            result = subprocess.run(
+                ["riscv32-esp-elf-addr2line", "-aipfe", elf, address],
+                capture_output=True,
+            )
+            stdout = result.stdout.decode("utf-8")
+            if not stdout:
+                continue
+            if "?? ??" not in stdout:
+                print(stdout.strip())
+                break
+
+    print("loop")
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index d6569bc39bd8e..f4ac2350ffbf1 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -992,7 +992,6 @@ endif
 
 # Sources used in all ports except unix.
 SRC_CIRCUITPY_COMMON = \
-	shared/libc/string0.c \
 	shared/readline/readline.c \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/ffunicode.c \
@@ -1004,6 +1003,10 @@ SRC_CIRCUITPY_COMMON = \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c
 
+ifeq ($(CIRCUITPY_LIBC_STRING0),1)
+SRC_CIRCUITPY_COMMON += shared/libc/string0.c
+endif
+
 ifeq ($(CIRCUITPY_QRIO),1)
 SRC_CIRCUITPY_COMMON += lib/quirc/lib/decode.c lib/quirc/lib/identify.c lib/quirc/lib/quirc.c lib/quirc/lib/version_db.c
 $(BUILD)/lib/quirc/lib/%.o: CFLAGS += -Wno-type-limits -Wno-shadow -Wno-sign-compare -include shared-module/qrio/quirc_alloc.h
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
index 8c838a41218a3..09ef4361427da 100644
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@@ -62,6 +62,15 @@ CFLAGS += -DCIRCUITPY_FULL_BUILD=$(CIRCUITPY_FULL_BUILD)
 # increased build time
 CIRCUITPY_MESSAGE_COMPRESSION_LEVEL ?= 9
 
+# By default, use our copy of TLSF. Some vendor SDKs may provide their own
+# implementation of TLSF, which can be used instead by setting CIRCUITPY_LIB_TLSF=0.
+CIRCUITPY_LIB_TLSF ?= 1
+
+# By default, use our copy of string0 (memcpy and friends) because it is optimized. Some vendor SDKs
+# or ROMs may provide their own implementation of string0, which can be used instead by setting
+# CIRCUITPY_LIBC_STRING0=0.
+CIRCUITPY_LIBC_STRING0 ?= 1
+
 # Reduce the size of in-flash properties. Requires support in the .ld linker
 # file, so not enabled by default.
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 0
diff --git a/shared-module/max3421e/Max3421E.c b/shared-module/max3421e/Max3421E.c
index 4946e4e7d8dfa..3448cdd4c7596 100644
--- a/shared-module/max3421e/Max3421E.c
+++ b/shared-module/max3421e/Max3421E.c
@@ -83,7 +83,7 @@ void common_hal_max3421e_max3421e_deinit(max3421e_max3421e_obj_t *self) {
 // anyway. Don't run background tasks because this function is used by
 // tuh_task() which is run as a background task.
 #if CFG_TUSB_OS == OPT_OS_NONE
-void osal_task_delay(uint32_t msec) {
+void tusb_time_delay_ms_api(uint32_t msec) {
     uint32_t end_time = common_hal_time_monotonic_ms() + msec;
     while (common_hal_time_monotonic_ms() < end_time) {
         if (tuh_callback.prev != NULL) {
diff --git a/supervisor/shared/usb/usb_device.c b/supervisor/shared/usb/usb_device.c
index ec08b8bf4d7e2..16ae137eddefb 100644
--- a/supervisor/shared/usb/usb_device.c
+++ b/supervisor/shared/usb/usb_device.c
@@ -166,6 +166,9 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ
  * @param wanted_char   The wanted char (set previously)
  */
 void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
+    // CircuitPython's VM is run in a separate FreeRTOS task from TinyUSB on ESP.
+    // So, we must notify the other task when a CTRL-C is received.
+    port_wake_main_task();
     // Workaround for using shared/runtime/interrupt_char.c
     // Compare mp_interrupt_char with wanted_char and ignore if not matched
     if (mp_interrupt_char == wanted_char) {
@@ -177,7 +180,14 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
 void tud_cdc_send_break_cb(uint8_t itf, uint16_t duration_ms) {
     if (usb_cdc_console_enabled() && mp_interrupt_char != -1 && itf == 0 && duration_ms > 0) {
         mp_sched_keyboard_interrupt();
+        port_wake_main_task();
     }
 }
 
+void tud_cdc_rx_cb(uint8_t itf) {
+    (void)itf;
+    // Workaround for "press any key to enter REPL" response being delayed on espressif.
+    // Wake main task when any key is pressed.
+    port_wake_main_task();
+}
 #endif
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 0ecc6ea3acfe6..21bda334131c7 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -1,6 +1,5 @@
 SRC_SUPERVISOR = \
 	main.c \
-	lib/tlsf/tlsf.c \
 	supervisor/port.c \
 	supervisor/shared/background_callback.c \
 	supervisor/shared/board.c \
@@ -20,6 +19,10 @@ SRC_SUPERVISOR = \
 	supervisor/shared/translate/translate.c \
 	supervisor/shared/workflow.c \
 
+ifeq ($(CIRCUITPY_LIB_TLSF),1)
+SRC_SUPERVISOR += lib/tlsf/tlsf.c
+endif
+
 # For tlsf
 CFLAGS += -D_DEBUG=0
 
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index 5361914af199b..38cce0f28be94 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -104,7 +104,7 @@ def check_vid_pid(files, clusterlist):
     """
 
     usb_pattern = re.compile(
-        r"^CIRCUITPY_USB_DEVICE\s*=\s*0$|^IDF_TARGET = (esp32|esp32c2|esp32c3|esp32c6|esp32h2|esp32p4)$|^MCU_SERIES = MG24$",
+        r"^CIRCUITPY_USB_DEVICE\s*=\s*0$|^IDF_TARGET = (esp32|esp32c2|esp32c3|esp32c5|esp32c6|esp32c61|esp32h2|esp32p4)$|^MCU_SERIES = MG24$",
         flags=re.M,
     )