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:
parent
035d16126a
commit
c9260dda23
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue