WIP: esp32: Add support to build using IDF cmake, with MicroPython as a cmake component #6473
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # CMake fragment for MicroPython extmod component | ||
|
|
||
| set(MPY_EXTMOD_DIR "${MPY_DIR}/extmod") | ||
| set(OOFATFS_DIR "${MPY_DIR}/lib/oofatfs") | ||
|
|
||
| set(SOURCE_EXTMOD | ||
| ${MPY_EXTMOD_DIR}/machine_i2c.c | ||
| ${MPY_EXTMOD_DIR}/machine_mem.c | ||
| ${MPY_EXTMOD_DIR}/machine_pulse.c | ||
| ${MPY_EXTMOD_DIR}/machine_signal.c | ||
| ${MPY_EXTMOD_DIR}/machine_spi.c | ||
| ${MPY_EXTMOD_DIR}/modbtree.c | ||
| ${MPY_EXTMOD_DIR}/modframebuf.c | ||
| ${MPY_EXTMOD_DIR}/moduasyncio.c | ||
| ${MPY_EXTMOD_DIR}/modubinascii.c | ||
| ${MPY_EXTMOD_DIR}/moducryptolib.c | ||
| ${MPY_EXTMOD_DIR}/moductypes.c | ||
| ${MPY_EXTMOD_DIR}/moduhashlib.c | ||
| ${MPY_EXTMOD_DIR}/moduheapq.c | ||
| ${MPY_EXTMOD_DIR}/modujson.c | ||
| ${MPY_EXTMOD_DIR}/modurandom.c | ||
| ${MPY_EXTMOD_DIR}/modure.c | ||
| ${MPY_EXTMOD_DIR}/moduselect.c | ||
| ${MPY_EXTMOD_DIR}/modussl_axtls.c | ||
| ${MPY_EXTMOD_DIR}/modussl_mbedtls.c | ||
| ${MPY_EXTMOD_DIR}/modutimeq.c | ||
| ${MPY_EXTMOD_DIR}/moduwebsocket.c | ||
| ${MPY_EXTMOD_DIR}/moduzlib.c | ||
| ${MPY_EXTMOD_DIR}/modwebrepl.c | ||
| ${MPY_EXTMOD_DIR}/uos_dupterm.c | ||
| ${MPY_EXTMOD_DIR}/utime_mphal.c | ||
| ${MPY_EXTMOD_DIR}/vfs.c | ||
| ${MPY_EXTMOD_DIR}/vfs_blockdev.c | ||
| ${MPY_EXTMOD_DIR}/vfs_fat.c | ||
| ${MPY_EXTMOD_DIR}/vfs_fat_diskio.c | ||
| ${MPY_EXTMOD_DIR}/vfs_fat_file.c | ||
| ${MPY_EXTMOD_DIR}/vfs_lfs.c | ||
| ${MPY_EXTMOD_DIR}/vfs_posix.c | ||
| ${MPY_EXTMOD_DIR}/vfs_posix_file.c | ||
| ${MPY_EXTMOD_DIR}/vfs_reader.c | ||
| ${MPY_EXTMOD_DIR}/virtpin.c | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| cmake_minimum_required(VERSION 3.5) | ||
| set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig) | ||
| set(SDKCONFIG_DEFAULTS boards/sdkconfig.base) | ||
| include($ENV{IDF_PATH}/tools/cmake/project.cmake) | ||
| project(micropython) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| # Set location of base MicroPython directory, and this port's directory. | ||
|
There was a problem hiding this comment. Does this file have to be in a subdirectory? (I know nothing about cmake) There was a problem hiding this comment. Yes. Or at least I couldn't work out how to put it in |
||
| get_filename_component(MPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE) | ||
| set(MPY_PORT_DIR ${PROJECT_DIR}) | ||
| set(MPY_BOARD_DIR ${PROJECT_DIR}/boards/GENERIC) | ||
|
|
||
| # Include core source components. | ||
| include(${MPY_DIR}/py/py.cmake) | ||
| include(${MPY_DIR}/extmod/extmod.cmake) | ||
|
|
||
| set(SOURCE_EXTMOD_EXTRA | ||
| ${MPY_DIR}/extmod/modonewire.c | ||
| ) | ||
|
|
||
| set(SOURCE_LIB | ||
| ${MPY_DIR}/lib/littlefs/lfs1.c | ||
| ${MPY_DIR}/lib/littlefs/lfs1_util.c | ||
| ${MPY_DIR}/lib/littlefs/lfs2.c | ||
| ${MPY_DIR}/lib/littlefs/lfs2_util.c | ||
| ${MPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c | ||
| ${MPY_DIR}/lib/mp-readline/readline.c | ||
| ${MPY_DIR}/lib/netutils/netutils.c | ||
| ${MPY_DIR}/lib/oofatfs/ff.c | ||
| ${MPY_DIR}/lib/oofatfs/ffunicode.c | ||
| ${MPY_DIR}/lib/timeutils/timeutils.c | ||
| ${MPY_DIR}/lib/utils/interrupt_char.c | ||
| ${MPY_DIR}/lib/utils/stdout_helpers.c | ||
| ${MPY_DIR}/lib/utils/sys_stdio_mphal.c | ||
| ${MPY_DIR}/lib/utils/pyexec.c | ||
| ) | ||
|
|
||
| set(SOURCE_DRIVERS | ||
| ${MPY_DIR}/drivers/bus/softspi.c | ||
| ${MPY_DIR}/drivers/dht/dht.c | ||
| ) | ||
|
|
||
| set(SOURCE_PORT | ||
| ${PROJECT_DIR}/main.c | ||
| ${PROJECT_DIR}/uart.c | ||
| ${PROJECT_DIR}/gccollect.c | ||
| ${PROJECT_DIR}/mphalport.c | ||
| ${PROJECT_DIR}/fatfs_port.c | ||
| ${PROJECT_DIR}/help.c | ||
| ${PROJECT_DIR}/modutime.c | ||
| ${PROJECT_DIR}/moduos.c | ||
| ${PROJECT_DIR}/machine_timer.c | ||
| ${PROJECT_DIR}/machine_pin.c | ||
| ${PROJECT_DIR}/machine_touchpad.c | ||
| ${PROJECT_DIR}/machine_adc.c | ||
| ${PROJECT_DIR}/machine_dac.c | ||
| ${PROJECT_DIR}/machine_i2c.c | ||
| ${PROJECT_DIR}/machine_pwm.c | ||
| ${PROJECT_DIR}/machine_uart.c | ||
| ${PROJECT_DIR}/modmachine.c | ||
| ${PROJECT_DIR}/modnetwork.c | ||
| ${PROJECT_DIR}/network_lan.c | ||
| ${PROJECT_DIR}/network_ppp.c | ||
| ${PROJECT_DIR}/mpnimbleport.c | ||
| ${PROJECT_DIR}/modsocket.c | ||
| ${PROJECT_DIR}/modesp.c | ||
| ${PROJECT_DIR}/esp32_partition.c | ||
| ${PROJECT_DIR}/esp32_rmt.c | ||
| ${PROJECT_DIR}/esp32_ulp.c | ||
| ${PROJECT_DIR}/modesp32.c | ||
| ${PROJECT_DIR}/espneopixel.c | ||
| ${PROJECT_DIR}/machine_hw_spi.c | ||
| ${PROJECT_DIR}/machine_wdt.c | ||
| ${PROJECT_DIR}/mpthreadport.c | ||
| ${PROJECT_DIR}/machine_rtc.c | ||
| ${PROJECT_DIR}/machine_sdcard.c | ||
| ) | ||
|
|
||
| set(SOURCE_QSTR | ||
| ${SOURCE_PY} | ||
| ${SOURCE_EXTMOD} | ||
| ${SOURCE_EXTMOD_EXTRA} | ||
| ${SOURCE_LIB} | ||
| ${SOURCE_PORT} | ||
| ) | ||
|
|
||
| # Register the main IDF component. | ||
| idf_component_register( | ||
| SRCS | ||
| ${SOURCE_PY} | ||
| ${SOURCE_EXTMOD} | ||
| ${SOURCE_EXTMOD_EXTRA} | ||
| ${SOURCE_LIB} | ||
| ${SOURCE_DRIVERS} | ||
| ${SOURCE_PORT} | ||
| INCLUDE_DIRS | ||
| ${MPY_DIR} | ||
| ${MPY_PORT_DIR} | ||
| ${MPY_BOARD_DIR} | ||
| ${CMAKE_BINARY_DIR} | ||
| REQUIRES | ||
| soc nvs_flash ulp sdmmc mdns app_update lwip | ||
| ) | ||
|
|
||
| # Define mpy-cross flags and frozen manifest | ||
| set(MPY_CROSS_FLAGS -march=xtensawin) | ||
| set(FROZEN_MANIFEST ${PROJECT_DIR}/boards/manifest.py) | ||
|
|
||
| # Include the main MicroPython cmake rules. | ||
| set(MICROPYTHON_TARGET ${COMPONENT_TARGET}) | ||
| include(${MPY_DIR}/py/mkrules.cmake) | ||
|
|
||
| # Set compile options for this port. | ||
| target_compile_options(${MICROPYTHON_TARGET} PUBLIC | ||
| -DMICROPY_ESP_IDF_4=1 | ||
| -DMICROPY_VFS_FAT=1 | ||
| -DMICROPY_VFS_LFS2=1 | ||
| -DFFCONF_H=\"${OOFATFS_DIR}/ffconf.h\" | ||
| -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT | ||
| -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT | ||
| ) | ||
|
|
||
| # Disable some warnings to keep the build output clean. | ||
| target_compile_options(${MICROPYTHON_TARGET} PUBLIC | ||
| -Wno-clobbered | ||
| -Wno-deprecated-declarations | ||
| -Wno-implicit-fallthrough | ||
| -Wno-missing-field-initializers | ||
| -Wno-override-init | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this work with esp-idf pre-4.1? Or is the idea to deprecate the use of older esp-idf versions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't get that far, I just wanted to get something working and get feedback (will add WIP to the PR title).
We can continue to support older IDF versions if it's not difficult, but I'd rather just support the latest (easier to test, etc).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NP, I just wanted to flag it.