From c9260dda23bfdaea042d3bb94e1a830af0dbfa18 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 3 Feb 2021 16:33:55 +1100 Subject: [PATCH] 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 --- ports/rp2/CMakeLists.txt | 3 +++ tools/ci.sh | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt index 160456c6b1..bd58d8f707 100644 --- a/ports/rp2/CMakeLists.txt +++ b/ports/rp2/CMakeLists.txt @@ -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) diff --git a/tools/ci.sh b/tools/ci.sh index c6b641dae9..8661f532ef 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -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 }