esp32 :Fix

Vincent1-python · Vincent1-python · commit 39b3536ad6fe · 2025-08-19T10:40:36.000+08:00
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_P4/sdkconfig.board
@@ -25,11 +25,6 @@ CONFIG_SOC_ULP_SUPPORTED=n
 CONFIG_ULP_COPROC_ENABLED=n
 CONFIG_ULP_COPROC_TYPE_FSM=n
 
-# Touchpad : not fixed
-CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
-SOC_TOUCH_SENSOR_SUPPORTED=y
-CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
-
 
 # Wifi
 #CONFIG_ESP_HOSTED_ENABLED=n
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/board.json b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/board.json
@@ -15,9 +15,9 @@
         ""
     ],
     "mcu": "esp32p4",
-    "product": "M5STACK TAB5",
+    "product": "Expressif ESP32P4",
     "thumbnail": "",
-    "url": "https://docs.m5stack.com/en/core/Tab5",
+    "url": "https://www.espressif.com/en/products/modules",
     "variants": {
     },
     "vendor": "Espressif"
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/board.md b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/board.md
@@ -0,0 +1,18 @@
+The following files are firmware that should work on most ESP32-based boards
+with 4MiB of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
+
+This board has multiple variants available:
+
+* If your board is based on a WROVER module, or otherwise has SPIRAM (also known
+  as PSRAM) then it's recommended to use the "spiram" variant. Look for heading
+  **Support for SPIRAM / WROVER)**.
+* If your board has a ESP32-D2WD chip (with only 2MiB flash) then use the "d2wd"
+  variant. Look for heading **ESP32 D2WD**.
+* If your board has a single-core ESP32 (e.g. the "SOLO" modules) then choose
+  the "unicore" variant. Look for heading **ESP32 Unicore**.
+* If you'd like to perform Over-the-Air updates of the MicroPython firmware,
+  then choose the "ota" variant. This variant has less room in the flash for
+  Python files as a result of supporting OTA. Look for heading **Support for
+  OTA**.
+
+Otherwise, download the generic variant (under the first heading below).
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.cmake
@@ -2,6 +2,5 @@ set(IDF_TARGET esp32p4)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
-    boards/sdkconfig.p4usb
-	boards/FireBeetle_2_ESP32_P4/sdkconfig.board
+	boards/ESP32_GENERIC_P4/sdkconfig.board
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.h
@@ -2,17 +2,16 @@
 // specified.
 
 #ifndef MICROPY_HW_BOARD_NAME
-#define MICROPY_HW_BOARD_NAME "FireBeetle 2 ESP32 P4"
+#define MICROPY_HW_BOARD_NAME "Generic ESP32P4 module"
 #endif
 
 #ifndef MICROPY_HW_MCU_NAME
 #define MICROPY_HW_MCU_NAME "ESP32P4"
 #endif
 
-#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE 	(1)
-#define MICROPY_HW_ENABLE_USBDEV				(1)
 #define MICROPY_PY_ESPNOW         	(0)
-#define MP_SD_LDO                           (1)
+
+
 #ifndef USB_SERIAL_JTAG_PACKET_SZ_BYTES
 #define USB_SERIAL_JTAG_PACKET_SZ_BYTES (64)
 #endif
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board
@@ -8,8 +8,6 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-#CONFIG_PARTITION_TABLE_CUSTOM=y
-#CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB_espdl.csv"
 
 # Memory
 CONFIG_SPIRAM=y
@@ -27,10 +25,6 @@ CONFIG_SOC_ULP_SUPPORTED=n
 CONFIG_ULP_COPROC_ENABLED=n
 CONFIG_ULP_COPROC_TYPE_FSM=n
 
-# Touchpad : not fixed
-CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=n
-SOC_TOUCH_SENSOR_SUPPORTED=n
-CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=n
 
 
 # Wifi
diff --git a/ports/esp32/boards/FireBeetle_2_ESP32_P4/board.md b/ports/esp32/boards/FireBeetle_2_ESP32_P4/board.md
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
@@ -54,7 +54,10 @@
 #endif
 
 #if SOC_I2C_SUPPORT_XTAL
-#define I2C_SCLK_FREQ XTAL_CLK_FREQ
+#if CONFIG_XTAL_FREQ > 0
+#define I2C_SCLK_FREQ (CONFIG_XTAL_FREQ * 1000000)
+#error "I2C uses XTAL but no configured freq"
+#endif // CONFIG_XTAL_FREQ
 #elif SOC_I2C_SUPPORT_APB
 #define I2C_SCLK_FREQ APB_CLK_FREQ
 #else

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@ set(IDF_TARGET esp32p4)`
`2`	`2`
`3`	`3`	`set(SDKCONFIG_DEFAULTS`
`4`	`4`	`boards/sdkconfig.base`
`5`		`- boards/sdkconfig.p4usb`
`6`		`- boards/FireBeetle_2_ESP32_P4/sdkconfig.board`
	`5`	`+ boards/ESP32_GENERIC_P4/sdkconfig.board`
`7`	`6`	`)`