djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rp2/CMakeLists: Simplify qstr sources when enabling extmod components. 

Also remove redundant modusocket.c and modnetwork.c sources, they are
already added by extmod/extmod.cmake.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-06-07 14:33:09 +10:00
parent a446a7bdef
commit 66dfe17b18
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ports/rp2/CMakeLists.txt
View File

@ -104,6 +104,7 @@ set(MICROPY_SOURCE_PORT
modrp2.c modrp2.c
modutime.c modutime.c
mphalport.c mphalport.c
mpnetworkport.c
mpthreadport.c mpthreadport.c
rp2_flash.c rp2_flash.c
rp2_pio.c rp2_pio.c
@ -115,8 +116,6 @@ set(MICROPY_SOURCE_PORT
set(MICROPY_SOURCE_QSTR set(MICROPY_SOURCE_QSTR
${MICROPY_SOURCE_PY} ${MICROPY_SOURCE_PY}
${MICROPY_SOURCE_EXTMOD}
${MICROPY_SOURCE_USERMOD}
${MICROPY_DIR}/shared/runtime/mpirq.c ${MICROPY_DIR}/shared/runtime/mpirq.c
${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
${PROJECT_SOURCE_DIR}/machine_adc.c ${PROJECT_SOURCE_DIR}/machine_adc.c
@ -180,12 +179,7 @@ if (MICROPY_PY_LWIP)
MICROPY_PY_LWIP=1 MICROPY_PY_LWIP=1
) )
list(APPEND MICROPY_SOURCE_PORT list(APPEND MICROPY_SOURCE_EXTMOD
${MICROPY_EXTMOD_DIR}/modlwip.c
mpnetworkport.c
)
list(APPEND MICROPY_SOURCE_QSTR
${MICROPY_EXTMOD_DIR}/modlwip.c ${MICROPY_EXTMOD_DIR}/modlwip.c
) )
@ -238,10 +232,6 @@ if (MICROPY_PY_NETWORK_NINAW10)
list(APPEND MICROPY_SOURCE_EXTMOD list(APPEND MICROPY_SOURCE_EXTMOD
${MICROPY_DIR}/extmod/network_ninaw10.c ${MICROPY_DIR}/extmod/network_ninaw10.c
) )
list(APPEND MICROPY_SOURCE_QSTR
${MICROPY_DIR}/extmod/network_ninaw10.c
)
endif() endif()
if (MICROPY_PY_WIZNET5K) if (MICROPY_PY_WIZNET5K)
@ -277,20 +267,18 @@ if (MICROPY_PY_WIZNET5K)
) )
list(APPEND MICROPY_SOURCE_EXTMOD list(APPEND MICROPY_SOURCE_EXTMOD
${MICROPY_DIR}/extmod/modnetwork.c
${MICROPY_DIR}/extmod/modusocket.c
${MICROPY_DIR}/extmod/network_wiznet5k.c
)
list(APPEND MICROPY_SOURCE_QSTR
${MICROPY_DIR}/extmod/modnetwork.c
${MICROPY_DIR}/extmod/modusocket.c
${MICROPY_DIR}/extmod/network_wiznet5k.c ${MICROPY_DIR}/extmod/network_wiznet5k.c
) )
string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/wiznet5k) string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/wiznet5k)
endif() endif()
# Add qstr sources for extmod and usermod, in case they are modified by components above.
list(APPEND MICROPY_SOURCE_QSTR
${MICROPY_SOURCE_EXTMOD}
${MICROPY_SOURCE_USERMOD}
)
# Define mpy-cross flags # Define mpy-cross flags
set(MICROPY_CROSS_FLAGS -march=armv7m) set(MICROPY_CROSS_FLAGS -march=armv7m)