mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp32: Use better build settings for ESP32-C3. 

ESP32-C3 is not Xtensa-based, so build settings are now tailored a bit
better following that fact.  ESP-IDF 5.x already adds architecture-specific
modules by itself so there is no need to specify either the `xtensa` or the
`riscv` module in the build settings.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
This commit is contained in:
Alessandro Gatti 2023-10-31 13:28:25 +01:00 committed by Damien George
parent 4cffa848f6
commit 95ce61d0ad
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/esp32/esp32_common.cmake
View File

@ -134,7 +134,6 @@ list(APPEND IDF_COMPONENTS
spi_flash spi_flash
ulp ulp
vfs vfs
xtensa
) )
# Register the main IDF component. # Register the main IDF component.
@ -161,7 +160,9 @@ idf_component_register(
set(MICROPY_TARGET ${COMPONENT_TARGET}) set(MICROPY_TARGET ${COMPONENT_TARGET})
# Define mpy-cross flags, for use with frozen code. # Define mpy-cross flags, for use with frozen code.
if(NOT IDF_TARGET STREQUAL "esp32c3")
set(MICROPY_CROSS_FLAGS -march=xtensawin) set(MICROPY_CROSS_FLAGS -march=xtensawin)
endif()
# Set compile options for this port. # Set compile options for this port.
target_compile_definitions(${MICROPY_TARGET} PUBLIC target_compile_definitions(${MICROPY_TARGET} PUBLIC

1
ports/esp32/main_esp32c3/CMakeLists.txt
View File

@ -9,6 +9,5 @@ if(NOT MICROPY_PORT_DIR)
endif() endif()
list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c) list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
list(APPEND IDF_COMPONENTS riscv)
include(${MICROPY_PORT_DIR}/esp32_common.cmake) include(${MICROPY_PORT_DIR}/esp32_common.cmake)

8
py/mkrules.cmake
View File

@ -212,10 +212,16 @@ if(MICROPY_FROZEN_MANIFEST)
) )
endif() endif()
if(NOT MICROPY_CROSS_FLAGS)
set(MICROPY_CROSS_FLAGS "")
else()
set(MICROPY_CROSS_FLAGS "-f${MICROPY_CROSS_FLAGS}")
endif()
add_custom_target( add_custom_target(
BUILD_FROZEN_CONTENT ALL BUILD_FROZEN_CONTENT ALL
BYPRODUCTS ${MICROPY_FROZEN_CONTENT} BYPRODUCTS ${MICROPY_FROZEN_CONTENT}
COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST} COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" ${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
DEPENDS DEPENDS
${MICROPY_QSTRDEFS_GENERATED} ${MICROPY_QSTRDEFS_GENERATED}
${MICROPY_ROOT_POINTERS} ${MICROPY_ROOT_POINTERS}