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

rp2: Use local tinyusb instead of the one in pico-sdk. 

So that all MicroPython ports that use tinyusb use the same version.  Also
requires fewer submodule checkouts when building rp2 along with other ports
that use tinyusb.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2021-02-03 16:33:55 +11:00
parent 035d16126a
commit c9260dda23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/rp2/CMakeLists.txt
View File

@ -14,6 +14,9 @@ else()
set(PICO_SDK_PATH ../../lib/pico-sdk) set(PICO_SDK_PATH ../../lib/pico-sdk)
endif() endif()
# Use the local tinyusb instead of the one in pico-sdk
set(PICO_TINYUSB_PATH ${MPY_DIR}/lib/tinyusb)
# Include component cmake fragments # Include component cmake fragments
include(micropy_py.cmake) include(micropy_py.cmake)
include(micropy_extmod.cmake) include(micropy_extmod.cmake)

3
tools/ci.sh
View File

@ -195,8 +195,7 @@ function ci_rp2_setup {
function ci_rp2_build { function ci_rp2_build {
make ${MAKEOPTS} -C mpy-cross make ${MAKEOPTS} -C mpy-cross
git submodule update --init lib/pico-sdk git submodule update --init lib/pico-sdk lib/tinyusb
git -C lib/pico-sdk submodule update --init lib/tinyusb
make ${MAKEOPTS} -C ports/rp2 make ${MAKEOPTS} -C ports/rp2
} }