Commit c9260dda authored by Damien George's avatar Damien George

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: default avatarDamien George <damien@micropython.org>
parent 035d1612
......@@ -14,6 +14,9 @@ else()
set(PICO_SDK_PATH ../../lib/pico-sdk)
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(micropy_py.cmake)
include(micropy_extmod.cmake)
......
......@@ -195,8 +195,7 @@ function ci_rp2_setup {
function ci_rp2_build {
make ${MAKEOPTS} -C mpy-cross
git submodule update --init lib/pico-sdk
git -C lib/pico-sdk submodule update --init lib/tinyusb
git submodule update --init lib/pico-sdk lib/tinyusb
make ${MAKEOPTS} -C ports/rp2
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment