all: Updated MicroPython version to 1.25.0.

1. support esp32-p4.
2. still using i2c-driver.

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/CMakeLists.txt

@@ -3,7 +3,10 @@
 # SPDX-License-Identifier: MIT
 
 # Top-level cmake file for building MicroPython on ESP32.
-
+#
+# Note for maintainers: Where possible, functionality should be put into
+# esp32_common.cmake not this file. This is because this CMakeLists.txt file
+# needs to be duplicated for out-of-tree builds, and can easily get out of date.
 cmake_minimum_required(VERSION 3.12)
 
 set(CMAKE_C_FLAGS "-Wno-unused-variable -Wno-unused-but-set-variable")
@@ -42,12 +45,6 @@ set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 # Save the manifest file set from the cmake command line.
 set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
 
-# Specific options for IDF v5.2 and later
-set(SDKCONFIG_IDF_VERSION_SPECIFIC "")
-if (IDF_VERSION VERSION_GREATER_EQUAL "5.2.0")
-    set(SDKCONFIG_IDF_VERSION_SPECIFIC boards/sdkconfig.idf52)
-endif()
-
 # Include board config; this is expected to set (among other options):
 # - SDKCONFIG_DEFAULTS
 # - IDF_TARGET
@@ -88,11 +85,6 @@ endif()
 # Include main IDF cmake file.
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-# Set the location of the main component for the project (one per target).
-list(APPEND EXTRA_COMPONENT_DIRS 
-    main_${IDF_TARGET}
-)
-
 if (M5_CAMERA_MODULE_ENABLE AND BOARD_TYPE STREQUAL "cores3")
 list(APPEND EXTRA_COMPONENT_DIRS 
     components/esp_dl/esp-dl
@@ -102,12 +94,5 @@ list(APPEND EXTRA_COMPONENT_DIRS
 )
 endif()
 
-# Enable the panic handler wrapper
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
-
-# Patch LWIP memory pool allocators (see lwip_patch.c)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_malloc" APPEND)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_free" APPEND)
-
 # Define the project.
 project(micropython)

m5stack/CMakeListsDefault.cmake

@@ -12,6 +12,20 @@ if(NOT MICROPY_PORT_DIR)
     get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE)
 endif()
 
+# RISC-V specific inclusions
+if(CONFIG_IDF_TARGET_ARCH_RISCV)
+    list(APPEND MICROPY_SOURCE_LIB
+        ${MICROPY_DIR}/shared/runtime/gchelper_native.c
+        ${MICROPY_DIR}/shared/runtime/gchelper_rv32i.s
+    )
+endif()
+
+if(NOT DEFINED MICROPY_PY_TINYUSB)
+    if(CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3)
+        set(MICROPY_PY_TINYUSB ON)
+    endif()
+endif()
+
 # Include core source components.
 include(${MICROPY_DIR}/py/py.cmake)
 
@@ -57,7 +71,7 @@ list(APPEND MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
-string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
+list(APPEND GIT_SUBMODULES lib/tinyusb)
 if(MICROPY_PY_TINYUSB)
     set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
     string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
@@ -166,7 +180,6 @@ if (M5_CAMERA_MODULE_ENABLE)
     )
 endif()
 
-
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
@@ -214,7 +227,6 @@ list(APPEND IDF_COMPONENTS
     ulp
     usb
     vfs
-    xtensa
     esp_http_client
     esp-tls
     libffi
@@ -226,6 +238,10 @@ list(APPEND IDF_COMPONENTS
     esp_mm
 )
 
+if(CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3)
+    list(APPEND IDF_COMPONENTS xtensa)
+endif()
+
 if (M5_CAMERA_MODULE_ENABLE AND BOARD_TYPE STREQUAL "cores3")
 list(APPEND IDF_COMPONENTS
     esp-dl
@@ -251,6 +267,22 @@ if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s3")
     list(APPEND IDF_COMPONENTS esp_codec_dev)
 endif()
 
+# Provide the default LD fragment if not set
+if (MICROPY_USER_LDFRAGMENTS)
+    set(MICROPY_LDFRAGMENTS ${MICROPY_USER_LDFRAGMENTS})
+endif()
+
+if (UPDATE_SUBMODULES)
+    # ESP-IDF checks if some paths exist before CMake does. Some paths don't
+    # yet exist if this is an UPDATE_SUBMODULES pass on a brand new checkout, so remove
+    # any path which might not exist yet. A "real" build will not set UPDATE_SUBMODULES.
+    unset(MICROPY_SOURCE_TINYUSB)
+    unset(MICROPY_SOURCE_EXTMOD)
+    unset(MICROPY_SOURCE_LIB)
+    unset(MICROPY_INC_TINYUSB)
+    unset(MICROPY_INC_CORE)
+endif()
+
 # Register the main IDF component.
 idf_component_register(
     SRCS
@@ -271,7 +303,7 @@ idf_component_register(
         ${CMAKE_BINARY_DIR}
         ${CMAKE_CURRENT_LIST_DIR}
     LDFRAGMENTS
-        linker.lf
+        ${MICROPY_LDFRAGMENTS}
     REQUIRES
         ${IDF_COMPONENTS}
 )
@@ -280,8 +312,10 @@ idf_component_register(
 set(MICROPY_TARGET ${COMPONENT_TARGET})
 
 # Define mpy-cross flags, for use with frozen code.
-if(CONFIG_IDF_TARGET_ARCH STREQUAL "xtensa")
-set(MICROPY_CROSS_FLAGS -march=xtensawin)
+if(CONFIG_IDF_TARGET_ARCH_XTENSA)
+    set(MICROPY_CROSS_FLAGS -march=xtensawin)
+elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
+    set(MICROPY_CROSS_FLAGS -march=rv32imc)
 endif()
 
 if (M5_CAMERA_MODULE_ENABLE AND BOARD_TYPE STREQUAL "cores3")
@@ -326,6 +360,20 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
 target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
 target_link_libraries(${MICROPY_TARGET} usermod)
 
+# Extra linker options
+# (when wrap symbols are in standalone files, --undefined ensures
+# the linker doesn't skip that file.)
+target_link_options(${MICROPY_TARGET} PUBLIC
+  # Patch LWIP memory pool allocators (see lwip_patch.c)
+  -Wl,--undefined=memp_malloc
+  -Wl,--wrap=memp_malloc
+  -Wl,--wrap=memp_free
+
+  # Enable the panic handler wrapper
+  -Wl,--undefined=esp_panic_handler
+  -Wl,--wrap=esp_panic_handler
+)
+
 # Collect all of the include directories and compile definitions for the IDF components,
 # including those added by the IDF Component Manager via idf_components.yaml.
 foreach(comp ${__COMPONENT_NAMES_RESOLVED})

m5stack/Makefile

@@ -299,25 +299,39 @@ submodules:
 # Apply patches
 patch:
 	$(call Package/patche,$(abspath ./cmodules/lv_binding_micropython),$(abspath ./patches/0003-avoid-lv_bindings-compile-error.patch))
-	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0004-micropython-1.24-machine-adc-v5.x.diff))
-	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0005-micropython-fix-SDCard-16223.patch))
 	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0006-modtime-add-timezone-method.patch))
 	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0007-Add-set-default-netif-method.patch))
-	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0008-machine_uart-add-uart-mode.patch))
-	$(call Package/patche,$(abspath $(IDF_PATH)),$(abspath ./patches/1003-WIP-Compatible-with-esp-adf-v2.7.diff))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0009-micropython-1.25.0-add-esp32p4-pins.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0010-micropython-1.25.0-machine-adc-v5.x.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0011-micropython-1.25.0-fix-esp32-p4-pwm.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0012-micropython-1.25.0-fix-esp32-p4-modesp32.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0013-micropython-1.25.0-fix-touchpad.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0014-micropython-1.25.0-fix-timer.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0015-micropython-1.25.0-fix-hostname.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0016-micropython-1.25.0-fix-mpnimbleport.patch))
+	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0017-micropython-1.25.0-add-uart-mode.patch))
+	$(call Package/patche,$(abspath $(IDF_PATH)),$(abspath ./patches/1004-idf_v5.4_freertos.patch))
 	$(call Package/patche,$(abspath ./components/M5Unified/M5Unified),$(abspath ./patches/2005-Support-LTR553.patch))
 	$(call Package/patche,$(abspath $(ADF_PATH)),$(abspath ./patches/3002-Modify-i2s_stream_idf5.patch))
+	$(call Package/patche,$(abspath ./components/M5Unified/M5GFX),$(abspath ./patches/4002-M5GFX-use-i2c-driver.patch))
 	$(call Package/patche,$(abspath ./components/esp32-camera),$(abspath ./patches/5001-Add-software-i2c-support.patch))
 
 # Unapply patches
 unpatch:
 	$(call Package/unpatche,$(abspath ./cmodules/lv_binding_micropython),$(abspath ./patches/0003-avoid-lv_bindings-compile-error.patch))
-	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0008-machine_uart-add-uart-mode.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0017-micropython-1.25.0-add-uart-mode.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0016-micropython-1.25.0-fix-mpnimbleport.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0015-micropython-1.25.0-fix-hostname.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0014-micropython-1.25.0-fix-timer.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0013-micropython-1.25.0-fix-touchpad.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0012-micropython-1.25.0-fix-esp32-p4-modesp32.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0011-micropython-1.25.0-fix-esp32-p4-pwm.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0010-micropython-1.25.0-machine-adc-v5.x.patch))
+	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0009-micropython-1.25.0-add-esp32p4-pins.patch))
 	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0007-Add-set-default-netif-method.patch))
 	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0006-modtime-add-timezone-method.patch))
-	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0005-micropython-fix-SDCard-16223.patch))
-	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0004-micropython-1.24-machine-adc-v5.x.diff))
-	$(call Package/unpatche,$(abspath $(IDF_PATH)),$(abspath ./patches/1003-WIP-Compatible-with-esp-adf-v2.7.diff))
+	$(call Package/unpatche,$(abspath $(IDF_PATH)),$(abspath ./patches/1004-idf_v5.4_freertos.patch))
 	$(call Package/unpatche,$(abspath ./components/M5Unified/M5Unified),$(abspath ./patches/2005-Support-LTR553.patch))
 	$(call Package/unpatche,$(abspath $(ADF_PATH)),$(abspath ./patches/3002-Modify-i2s_stream_idf5.patch))
+	$(call Package/unpatche,$(abspath ./components/M5Unified/M5GFX),$(abspath ./patches/4002-M5GFX-use-i2c-driver.patch))
 	$(call Package/unpatche,$(abspath ./components/esp32-camera),$(abspath ./patches/5001-Add-software-i2c-support.patch))

m5stack/board.cpp

@@ -48,8 +48,8 @@ extern "C" {
         auto cfg = M5.config();
         cfg.output_power = false;
         M5.begin(cfg);
-        in_i2c_init();
         M5.In_I2C.release();
+        in_i2c_init();
     }
 
     void power_init()

m5stack/boards/M5STACK_CoreS3/board_init.c

@@ -23,7 +23,7 @@
 #include "esp_codec_dev.h"
 #include "esp_codec_dev_defaults.h"
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
+#if 0 //ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
 #include "driver/i2c_master.h"
 #define USE_IDF_I2C_MASTER
 #else
@@ -177,8 +177,8 @@ static int ut_i2c_init(uint8_t port)
     i2c_master_bus_config_t i2c_bus_config = {0};
     i2c_bus_config.clk_source = I2C_CLK_SRC_DEFAULT;
     i2c_bus_config.i2c_port = port;
-    i2c_bus_config.scl_io_num = TEST_BOARD_I2C_SCL_PIN;
-    i2c_bus_config.sda_io_num = TEST_BOARD_I2C_SDA_PIN;
+    i2c_bus_config.scl_io_num = 12;
+    i2c_bus_config.sda_io_num = 11;
     i2c_bus_config.glitch_ignore_cnt = 7;
     i2c_bus_config.flags.enable_internal_pullup = true;
     return i2c_new_master_bus(&i2c_bus_config, &i2c_bus_handle);

m5stack/boards/sdkconfig.base

@@ -49,7 +49,8 @@ CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
 # FreeRTOS
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
-CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=y
+CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=n
+CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK=y
 
 # UDP
 CONFIG_LWIP_PPP_SUPPORT=y
@@ -63,6 +64,9 @@ CONFIG_MBEDTLS_HAVE_TIME_DATE=y
 CONFIG_MBEDTLS_PLATFORM_TIME_ALT=y
 CONFIG_MBEDTLS_HAVE_TIME=y
 
+# Enable DTLS
+CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+
 # Disable ALPN support as it's not implemented in MicroPython
 CONFIG_MBEDTLS_SSL_ALPN=n
 

m5stack/cmodules/m5unified/m5unified_lvgl.c

@@ -21,7 +21,7 @@ mp_obj_t mp_lv_task_handler(mp_obj_t self_in) {
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_lv_task_handler_obj, mp_lv_task_handler);
 
 static void vTimerCallback(TimerHandle_t plvgl_timer) {
-    lv_tick_inc(portTICK_RATE_MS * 10);
+    lv_tick_inc(portTICK_PERIOD_MS * 10);
     mp_sched_schedule((mp_obj_t)&mp_lv_task_handler_obj, mp_const_none);
 }
 

m5stack/cmodules/omv/modules/py_jpg.c

@@ -42,7 +42,7 @@ static mp_obj_t py_jpg_encode(size_t n_args, const mp_obj_t *args) {
     if (img_jpg.data) {
         free(img_jpg.data);
     }
-    fmt2jpg(img->data, img->size, img->w, img->h, PIXFORMAT_RGB565, quality, &img_jpg.data, &img_jpg.size);
+    fmt2jpg(img->data, img->size, img->w, img->h, PIXFORMAT_RGB565, quality, &img_jpg.data, (size_t *)&img_jpg.size);
 
     return py_image_from_struct(&img_jpg);
 }

m5stack/components/M5Unified/CMakeLists.txt

@@ -18,6 +18,8 @@ file(GLOB SRCS
     M5GFX/src/lgfx/v1/panel/*.cpp
     M5GFX/src/lgfx/v1/platforms/esp32/*.cpp
     M5GFX/src/lgfx/v1/platforms/esp32c3/*.cpp
+    # M5GFX/src/lgfx/v1/platforms/esp32s3/*.cpp
+    M5GFX/src/lgfx/v1/platforms/esp32p4/*.cpp
     M5GFX/src/lgfx/v1/touch/*.cpp
     M5Unified/src/*.cpp
     M5Unified/src/utility/*.cpp
@@ -27,9 +29,9 @@ file(GLOB SRCS
 
 set(COMPONENT_SRCS ${SRCS})
 if (IDF_VERSION_MAJOR GREATER_EQUAL 5)
-    set(COMPONENT_REQUIRES esp_adc nvs_flash efuse driver esp_timer main_${IDF_TARGET})
+    set(COMPONENT_REQUIRES esp_adc nvs_flash efuse driver esp_timer esp_lcd main)
 else()
-    set(COMPONENT_REQUIRES esp_adc_cal nvs_flash efuse main)
+    set(COMPONENT_REQUIRES esp_adc_cal nvs_flash efuse esp_lcd main)
 endif()
 
 register_component()