Fix build for all 9 ESP32 chipsets with IDF v6.0

- Move chip-specific IDF components (esp_hal_rmt, esp_hal_usb, esp_hal_dma,
  esp_hal_pmu, esp_driver_usb_serial_jtag) from common link list to per-chip
  CHIP_COMPONENTS since not all chips have these as static libraries
- Re-add rom.wdt.ld linker scripts from new esp_hal_wdt component paths
- Re-add esp32s2.rom.spiflash_legacy.ld for S2
- Add P4 register include paths (hw_ver3/hw_ver1), LDO include, and
  eco5 ROM linker scripts
- Remove xesppie from P4 -march flag (GCC doesn't support it, clang-only)
- Guard RTC_DATA_ATTR for chips without RTC memory (C2, C61)
- Remove use_dma2d flag from MIPI DSI config (now separate API in v6.0)
- Migrate I2CTarget to new i2c_slave driver API (legacy i2c removed)
- Update protomatter submodule for gpio_struct.h include

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: tannewt

lib/protomatter

@@ -253,7 +253,7 @@ ifeq ($(IDF_TARGET_ARCH),xtensa)
 else ifeq ($(IDF_TARGET_ARCH),riscv)
 
 	ifeq ($(IDF_TARGET),esp32p4)
-		CFLAGS += -march=rv32imafc_zicsr_zifencei_xesppie -mabi=ilp32f
+		CFLAGS += -march=rv32imafc_zicsr_zifencei -mabi=ilp32f
 	else
 		CFLAGS += -march=rv32imac_zicsr_zifencei
 	endif
@@ -294,7 +294,7 @@ LDFLAGS += \
 
 CHIP_COMPONENTS = \
 	esp_driver_dac \
-	esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_touch_sens esp_hal_twai
+	esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_rmt esp_hal_touch_sens esp_hal_twai
 
 else ifeq ($(IDF_TARGET),esp32c2)
 LDFLAGS += \
@@ -310,7 +310,8 @@ LDFLAGS += \
 CFLAGS += -DSOC_XTAL_FREQ_MHZ=CONFIG_XTAL_FREQ
 
 CHIP_COMPONENTS = \
-	esp_driver_tsens
+	esp_driver_tsens \
+	esp_hal_dma esp_hal_pmu
 
 else ifeq ($(IDF_TARGET),esp32c3)
 # esp32c2 has none of: esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_touch_sens esp_hal_twai
@@ -324,7 +325,8 @@ LDFLAGS += \
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens \
-	esp_hal_i2s esp_hal_twai
+	esp_driver_usb_serial_jtag \
+	esp_hal_dma esp_hal_i2s esp_hal_pmu esp_hal_rmt esp_hal_twai esp_hal_usb
 
 else ifeq ($(IDF_TARGET),esp32c6)
 LDFLAGS += \
@@ -341,7 +343,8 @@ LDFLAGS += \
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens \
-	esp_hal_i2s esp_hal_pcnt esp_hal_twai
+	esp_driver_usb_serial_jtag \
+	esp_hal_dma esp_hal_i2s esp_hal_pcnt esp_hal_pmu esp_hal_rmt esp_hal_twai esp_hal_usb
 
 else ifeq ($(IDF_TARGET),esp32c61)
 LDFLAGS += \
@@ -359,20 +362,30 @@ LDFLAGS += \
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens \
-	esp_hal_i2s
+	esp_driver_usb_serial_jtag \
+	esp_hal_dma esp_hal_i2s esp_hal_pmu esp_hal_usb
 
 else ifeq ($(IDF_TARGET),esp32p4)
+CFLAGS += \
+	-isystem esp-idf/components/soc/esp32p4/register/hw_ver3 \
+	-isystem esp-idf/components/soc/esp32p4/register/hw_ver1 \
+	-isystem esp-idf/components/esp_hw_support/ldo/include
+
 LDFLAGS += \
 	-Tesp32p4.rom.libc.ld \
 	-Tesp32p4.rom.newlib.ld \
 	-Tesp32p4.rom.systimer.ld \
+	-Tesp32p4.rom.eco5.ld \
+	-Tesp32p4.rom.eco5.libc.ld \
+	-Tesp32p4.rom.eco5.rvfp.ld \
+	-Tesp32p4.rom.version.ld \
 	-Trom.wdt.ld
 
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens \
 	esp_driver_usb_serial_jtag \
-	esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_touch_sens esp_hal_twai
+	esp_hal_dma esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_pmu esp_hal_rmt esp_hal_touch_sens esp_hal_twai esp_hal_usb
 
 else ifeq ($(IDF_TARGET),esp32h2)
 LDFLAGS += \
@@ -384,18 +397,20 @@ LDFLAGS += \
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens \
-	esp_hal_i2s esp_hal_pcnt esp_hal_twai
+	esp_driver_usb_serial_jtag \
+	esp_hal_dma esp_hal_i2s esp_hal_pcnt esp_hal_pmu esp_hal_rmt esp_hal_twai esp_hal_usb
 
 else ifeq ($(IDF_TARGET),esp32s2)
 LDFLAGS += \
 	-Tesp32s2.rom.libc-funcs.ld \
 	-Tesp32s2.rom.newlib-data.ld \
-	-Tesp32s2.rom.newlib-reent-funcs.ld
+	-Tesp32s2.rom.newlib-reent-funcs.ld \
+	-Tesp32s2.rom.spiflash_legacy.ld
 
 CHIP_COMPONENTS = \
 	esp_driver_dac \
 	esp_driver_tsens \
-	esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_touch_sens esp_hal_twai
+	esp_hal_dma esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_rmt esp_hal_touch_sens esp_hal_twai esp_hal_usb
 
 else ifeq ($(IDF_TARGET),esp32s3)
 LDFLAGS += \
@@ -408,7 +423,8 @@ LDFLAGS += \
 
 CHIP_COMPONENTS = \
 	esp_driver_tsens \
-	esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_touch_sens esp_hal_twai
+	esp_driver_usb_serial_jtag \
+	esp_hal_dma esp_hal_i2s esp_hal_lcd esp_hal_pcnt esp_hal_pmu esp_hal_rmt esp_hal_touch_sens esp_hal_twai esp_hal_usb
 
 endif
 
@@ -759,7 +775,7 @@ ifeq ($(IDF_TARGET),esp32)
 BINARY_BLOBS += esp-idf/components/esp_phy/lib/$(IDF_TARGET)/librtc.a
 endif
 
-ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_dma esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_ledc esp_driver_spi esp_driver_uart esp_driver_usb_serial_jtag efuse esp_adc esp_app_format esp_common esp_event esp_gdbstub esp_hal_ana_conv esp_hal_clock esp_hal_dma esp_hal_gpio esp_hal_gpspi esp_hal_i2c esp_hal_ledc esp_hal_mspi esp_hal_pmu esp_hal_rmt esp_hal_security esp_hal_timg esp_hal_uart esp_hal_usb esp_hal_wdt esp_hw_support esp_mm esp_partition esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log esp_libc nvs_flash nvs_sec_provider pthread soc spi_flash vfs esp_stdio
+ESP_IDF_COMPONENTS_LINK = $(IDF_TARGET_ARCH) $(CHIP_COMPONENTS) app_update bootloader_support driver esp_driver_dma esp_driver_gpio esp_driver_gptimer esp_driver_i2c esp_driver_ledc esp_driver_spi esp_driver_uart efuse esp_adc esp_app_format esp_common esp_event esp_gdbstub esp_hal_ana_conv esp_hal_clock esp_hal_gpio esp_hal_gpspi esp_hal_i2c esp_hal_ledc esp_hal_mspi esp_hal_security esp_hal_timg esp_hal_uart esp_hal_wdt esp_hw_support esp_mm esp_partition esp_pm esp_ringbuf esp_rom esp_system esp_timer freertos hal heap log esp_libc nvs_flash nvs_sec_provider pthread soc spi_flash vfs esp_stdio
 ifneq ($(CIRCUITPY_WIFI),0)
 	ESP_IDF_COMPONENTS_LINK += esp_coex esp_netif esp_security esp-tls esp_wifi lwip mbedtls mdns wpa_supplicant esp_phy
 endif

ports/espressif/Makefile

@@ -15,7 +15,12 @@
 
 // Data storage for singleton instance of SleepMemory.
 // Might be RTC_SLOW_MEM or RTC_FAST_MEM, depending on setting of CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM.
+#if defined(CONFIG_SOC_RTC_FAST_MEM_SUPPORTED) || defined(CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED)
 static RTC_DATA_ATTR uint8_t _sleep_mem[SLEEP_MEMORY_LENGTH];
+#else
+// Chips without RTC memory can't persist SleepMemory across deep sleep.
+static uint8_t _sleep_mem[SLEEP_MEMORY_LENGTH];
+#endif
 
 void alarm_sleep_memory_reset(void) {
     // ESP-IDF build system takes care of doing esp_sleep_pd_config() or the equivalent with

ports/espressif/common-hal/alarm/SleepMemory.c

@@ -9,7 +9,6 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 
-#include "components/driver/i2c/include/driver/i2c.h"
 #include "driver/gpio.h"
 
 #include "bindings/espidf/__init__.h"

ports/espressif/common-hal/busio/I2C.c

@@ -12,6 +12,19 @@
 #include "common-hal/i2ctarget/I2CTarget.h"
 #include "shared-bindings/microcontroller/Pin.h"
 
+static bool i2c_slave_on_receive(i2c_slave_dev_handle_t i2c_slave, const i2c_slave_rx_done_event_data_t *evt_data, void *arg) {
+    i2ctarget_i2c_target_obj_t *self = (i2ctarget_i2c_target_obj_t *)arg;
+    for (uint32_t i = 0; i < evt_data->length; i++) {
+        uint16_t next_head = (self->recv_head + 1) % I2CTARGET_RECV_BUF_SIZE;
+        if (next_head == self->recv_tail) {
+            break; // buffer full
+        }
+        self->recv_buf[self->recv_head] = evt_data->buffer[i];
+        self->recv_head = next_head;
+    }
+    return false;
+}
+
 void common_hal_i2ctarget_i2c_target_construct(i2ctarget_i2c_target_obj_t *self,
     const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda,
     uint8_t *addresses, unsigned int num_addresses, bool smbus) {
@@ -31,32 +44,40 @@ void common_hal_i2ctarget_i2c_target_construct(i2ctarget_i2c_target_obj_t *self,
 
     self->sda_pin = sda;
     self->scl_pin = scl;
-    self->i2c_num = peripherals_i2c_get_free_num();
 
-    if (self->i2c_num == I2C_NUM_MAX) {
-        mp_raise_ValueError(MP_ERROR_TEXT("All I2C peripherals are in use"));
-    }
-
-    const i2c_config_t i2c_conf = {
-        .mode = I2C_MODE_SLAVE,
-        .sda_io_num = self->sda_pin->number,
-        .scl_io_num = self->scl_pin->number,
-        .sda_pullup_en = GPIO_PULLUP_ENABLE,
-        .scl_pullup_en = GPIO_PULLUP_ENABLE,
-        .slave.addr_10bit_en = 0,
-        .slave.slave_addr = self->addresses[0],
+    self->recv_head = 0;
+    self->recv_tail = 0;
+
+    i2c_slave_config_t slave_config = {
+        .i2c_port = -1, // auto
+        .sda_io_num = sda->number,
+        .scl_io_num = scl->number,
+        .clk_source = I2C_CLK_SRC_DEFAULT,
+        .send_buf_depth = 256,
+        .receive_buf_depth = 256,
+        .slave_addr = addresses[0],
+        .addr_bit_len = I2C_ADDR_BIT_LEN_7,
+        .flags = {
+            .enable_internal_pullup = true,
+        },
     };
 
-    // Initialize I2C.
-    esp_err_t err = peripherals_i2c_init(self->i2c_num, &i2c_conf);
+    esp_err_t err = i2c_new_slave_device(&slave_config, &self->handle);
     if (err != ESP_OK) {
-        if (err == ESP_FAIL) {
+        if (err == ESP_ERR_NOT_FOUND) {
+            mp_raise_ValueError(MP_ERROR_TEXT("All I2C peripherals are in use"));
+        } else if (err == ESP_FAIL) {
             mp_raise_OSError(MP_EIO);
         } else {
             mp_arg_error_invalid(MP_QSTR_I2CTarget);
         }
     }
 
+    i2c_slave_event_callbacks_t cbs = {
+        .on_receive = i2c_slave_on_receive,
+    };
+    i2c_slave_register_event_callbacks(self->handle, &cbs, self);
+
     claim_pin(sda);
     claim_pin(scl);
 }
@@ -70,7 +91,8 @@ void common_hal_i2ctarget_i2c_target_deinit(i2ctarget_i2c_target_obj_t *self) {
         return;
     }
 
-    peripherals_i2c_deinit(self->i2c_num);
+    i2c_del_slave_device(self->handle);
+    self->handle = NULL;
 
     common_hal_reset_pin(self->sda_pin);
     common_hal_reset_pin(self->scl_pin);
@@ -83,24 +105,34 @@ int common_hal_i2ctarget_i2c_target_is_addressed(i2ctarget_i2c_target_obj_t *sel
     *address = self->addresses[0];
     *is_read = true;
     *is_restart = false;
-    return 1;
+    // Check if we have received data
+    if (self->recv_head != self->recv_tail) {
+        *is_read = false;
+        return 1;
+    }
+    return 0;
 }
 
 int common_hal_i2ctarget_i2c_target_read_byte(i2ctarget_i2c_target_obj_t *self, uint8_t *data) {
-    i2c_slave_read_buffer(self->i2c_num, data, 128, 0);
+    if (self->recv_head == self->recv_tail) {
+        return 0; // no data available
+    }
+    *data = self->recv_buf[self->recv_tail];
+    self->recv_tail = (self->recv_tail + 1) % I2CTARGET_RECV_BUF_SIZE;
     return 1;
 }
 
 int common_hal_i2ctarget_i2c_target_write_byte(i2ctarget_i2c_target_obj_t *self, uint8_t data) {
-    i2c_reset_tx_fifo(self->i2c_num);
-    i2c_slave_write_buffer(self->i2c_num, &data, 128, 0);
+    uint32_t write_len;
+    esp_err_t err = i2c_slave_write(self->handle, &data, 1, &write_len, 100);
+    if (err != ESP_OK || write_len == 0) {
+        return 0;
+    }
     return 1;
 }
 
 void common_hal_i2ctarget_i2c_target_ack(i2ctarget_i2c_target_obj_t *self, bool ack) {
-
 }
 
 void common_hal_i2ctarget_i2c_target_close(i2ctarget_i2c_target_obj_t *self) {
-
 }

ports/espressif/common-hal/i2ctarget/I2CTarget.c

@@ -7,14 +7,19 @@
 #pragma once
 
 #include "py/obj.h"
-#include "peripherals/i2c.h"
+#include "driver/i2c_slave.h"
 #include "common-hal/microcontroller/Pin.h"
 
+#define I2CTARGET_RECV_BUF_SIZE 128
+
 typedef struct {
     mp_obj_base_t base;
-    i2c_port_t i2c_num;
+    i2c_slave_dev_handle_t handle;
     uint8_t *addresses;
     uint8_t num_addresses;
     const mcu_pin_obj_t *scl_pin;
     const mcu_pin_obj_t *sda_pin;
+    uint8_t recv_buf[I2CTARGET_RECV_BUF_SIZE];
+    volatile uint16_t recv_head;
+    volatile uint16_t recv_tail;
 } i2ctarget_i2c_target_obj_t;

ports/espressif/common-hal/i2ctarget/I2CTarget.h

@@ -88,7 +88,6 @@ void common_hal_mipidsi_display_construct(mipidsi_display_obj_t *self,
             .vsync_front_porch = vsync_front_porch,
         },
         .flags = {
-            .use_dma2d = false,
             .disable_lp = false,
         },
     };