third-party: Fix compilation errors.

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

Author: lbuque

third-party/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")
@@ -18,7 +21,7 @@ set(IDF_VERSION "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}"
 
 # Set the board if it's not already set.
 if(NOT MICROPY_BOARD)
-    set(MICROPY_BOARD M5STACK_4MB)
+    set(MICROPY_BOARD ESPRESSIF_ESP32_S3_BOX_3)
 endif()
 
 # Set the board directory and check that it exists.
@@ -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
@@ -77,34 +74,28 @@ set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
 
 if(BUILD_WITH_LVGL)
     # Include LVGL component, ignore KCONFIG
-    idf_build_set_property(LV_MICROPYTHON 1)
-    idf_build_component(${CMAKE_SOURCE_DIR}/components/lv_bindings/lvgl)
-    idf_build_set_property(COMPILE_DEFINITIONS "-DLV_KCONFIG_IGNORE" APPEND)
-    separate_arguments(LV_CFLAGS_ENV UNIX_COMMAND $ENV{LV_CFLAGS})
-    list(APPEND LV_CFLAGS ${LV_CFLAGS_ENV})
-    idf_build_set_property(COMPILE_DEFINITIONS "${LV_CFLAGS}" APPEND)
+    # idf_build_set_property(LV_MICROPYTHON 1)
+    # idf_build_component(${CMAKE_SOURCE_DIR}/components/lv_bindings/lvgl)
+    # idf_build_set_property(COMPILE_DEFINITIONS "-DLV_KCONFIG_IGNORE" APPEND)
+    # separate_arguments(LV_CFLAGS_ENV UNIX_COMMAND $ENV{LV_CFLAGS})
+    # list(APPEND LV_CFLAGS ${LV_CFLAGS_ENV})
+    # idf_build_set_property(COMPILE_DEFINITIONS "${LV_CFLAGS}" APPEND)
 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})
+list(APPEND EXTRA_COMPONENT_DIRS main)
 list(APPEND EXTRA_COMPONENT_DIRS ../m5stack/components/esp32-camera)
 list(APPEND EXTRA_COMPONENT_DIRS ../m5stack/components/libffi)
 # list(APPEND EXTRA_COMPONENT_DIRS ../m5stack/components/lv_bindings)
 list(APPEND EXTRA_COMPONENT_DIRS ../m5stack/components/M5Unified/M5GFX)
 list(APPEND EXTRA_COMPONENT_DIRS ../m5stack/components/M5Unified/M5Unified)
 list(APPEND EXTRA_COMPONENT_DIRS ./components/BOX3GFX)
 list(APPEND EXTRA_COMPONENT_DIRS ../m5stack/components/uiflow_utility)
+list(APPEND EXTRA_COMPONENT_DIRS ../m5stack/components/esp_dmx)
 # list(APPEND EXTRA_COMPONENT_DIRS ./boards)
 
-# 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)

third-party/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)
@@ -76,6 +90,7 @@ if(MICROPY_PY_TINYUSB)
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
         ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
+        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_runtime.c
     )
 
     list(APPEND MICROPY_INC_TINYUSB
@@ -121,7 +136,7 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/../m5stack/modesp32.c
     ${PROJECT_DIR}/../micropython/ports/esp32/machine_hw_spi.c
     ${PROJECT_DIR}/../micropython/ports/esp32/mpthreadport.c
-    ${PROJECT_DIR}/../micropython/ports/esp32/machine_rtc.c
+    ${PROJECT_DIR}/../m5stack/machine_rtc.c
     ${PROJECT_DIR}/../micropython/ports/esp32/machine_sdcard.c
     ${PROJECT_DIR}/../micropython/ports/esp32/modespnow.c
 )
@@ -153,6 +168,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
     ${MICROPY_SOURCE_BOARD}
+    ${MICROPY_SOURCE_TINYUSB}
     # ${MICROPY_SOURCE_M5UNIFIED}
     ${MICROPY_SOURCE_M5CAMERA}
 )
@@ -191,7 +207,6 @@ set(IDF_COMPONENTS
     ulp
     usb
     vfs
-    xtensa
     esp_http_client
     esp-tls
     libffi
@@ -200,8 +215,15 @@ set(IDF_COMPONENTS
     BOX3GFX
     esp32-camera
     uiflow_utility
+    esp_dmx
+    esp_mm
+    esp_driver_ppa
 )
 
+if(CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3)
+    list(APPEND IDF_COMPONENTS xtensa)
+endif()
+
 if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s3")
     list(APPEND IDF_COMPONENTS boards)
     list(APPEND IDF_COMPONENTS audio_pipeline)
@@ -211,6 +233,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
@@ -230,7 +268,7 @@ idf_component_register(
         ${MICROPY_BOARD_DIR}
         ${CMAKE_BINARY_DIR}
     LDFRAGMENTS
-        linker.lf
+        ${MICROPY_LDFRAGMENTS}
     REQUIRES
         ${IDF_COMPONENTS}
 )
@@ -239,8 +277,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()
 
 # Set compile options for this port.
@@ -266,7 +306,7 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
 )
 
 target_link_options(${MICROPY_TARGET} PUBLIC
-     ${MICROPY_LINK_TINYUSB}
+    ${MICROPY_LINK_TINYUSB}
 )
 
 # Additional include directories needed for private NimBLE headers.
@@ -278,6 +318,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})
@@ -313,4 +367,4 @@ add_custom_command(
         ${GEN_PINS_PREFIX}
     VERBATIM
     COMMAND_EXPAND_LISTS
-)
+)

third-party/boards/SEEED_STUDIO_XIAO_ESP32S3/mpconfigboard.cmake

@@ -11,15 +11,16 @@ set(BOARD_ID 136)
 set(M5_CAMERA_MODULE_ENABLE TRUE)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/SEEED_STUDIO_XIAO_ESP32S3/sdkconfig.board
     ./boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
     ./boards/sdkconfig.ble
     ./boards/sdkconfig.usb
     ./boards/sdkconfig.flash_8mb
     ./boards/sdkconfig.spiram_sx
     ./boards/sdkconfig.spiram_oct
+    ./boards/SEEED_STUDIO_XIAO_ESP32S3/sdkconfig.board
 )
 
 # If not enable LVGL, ignore this...

third-party/boards/SEEED_STUDIO_XIAO_ESP32S3/sdkconfig.board

@@ -14,7 +14,10 @@ CONFIG_SPIRAM_MEMTEST=
 # M5STACK UiFlow USB description
 CONFIG_TINYUSB_DESC_CDC_STRING="Seeed XIAO-ESP32S3(UiFlow2)"
 
+# SSL
+CONFIG_MBEDTLS_AES_USE_INTERRUPT=n
+
 #
 # Audio HAL
 #
-CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
+CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y

third-party/boards/sdkconfig.base

@@ -8,16 +8,16 @@ CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 
 # Application manager
-CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
-CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
+# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
+# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 
 # Bootloader config
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 
 # Change default log level to "ERROR" (instead of "INFO")
-CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
 
 # Set the maximum included log level higher than the default,
 # so esp.osdebug() can enable more logging at runtime.
@@ -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
 
@@ -126,7 +130,7 @@ CONFIG_ETH_SPI_ETHERNET_DM9051=y
 # functions are in ROM. Note some newer chips (c2,c6) have "full" newlib
 # formatting in ROM instead and should override this, check
 # ESP_ROM_HAS_NEWLIB_NANO_FORMAT.
-CONFIG_NEWLIB_NANO_FORMAT=y
+CONFIG_NEWLIB_NANO_FORMAT=n
 
 # IRAM/DRAM split protection is a memory protection feature on some parts
 # that support SOC_CPU_IDRAM_SPLIT_USING_PMP, eg. C2, C5, C6, H2

third-party/boards/sdkconfig.flash_12mb

@@ -5,4 +5,4 @@
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_16mb.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_16mb.csv"

third-party/boards/sdkconfig.flash_16mb

@@ -5,4 +5,4 @@
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_16mb.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_16mb.csv"

third-party/boards/sdkconfig.flash_4mb

@@ -5,4 +5,4 @@
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_4mb.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_4mb.csv"

third-party/boards/sdkconfig.flash_8mb

@@ -5,4 +5,4 @@
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_8mb.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_8mb.csv"

third-party/boards/sdkconfig.spiram

@@ -1,16 +1,18 @@
-# SPDX-FileCopyrightText: Copyright (c) 2014 Damien P. George
-#
-# SPDX-License-Identifier: MIT
-
 # MicroPython on ESP32, ESP IDF configuration with SPIRAM support
 
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-#CONFIG_SPIRAM_USE_MEMMAP=y
+CONFIG_SPIRAM_USE_MALLOC=y
+
+# This is the threshold for preferring small allocations from internal memory
+# first, before failing over to PSRAM.
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=8192
 
+# SPIRAM increases the size of the firmware and overflows iram0_0_seg, due
+# to PSRAM bug workarounds.  Apply some options to reduce the firmware size.
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
-CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
+# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y # Workaround required: see main_esp32/linker.lf
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
-CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
+CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y