summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2021-02-03 16:33:55 +1100
committerDamien George <damien@micropython.org>2021-02-12 12:56:28 +1100
commitc9260dda23bfdaea042d3bb94e1a830af0dbfa18 (patch)
tree090c942fbb3a8bf44e3f619948918606729d6242
parent035d16126ac2e4ea9b9c1c33a15104cd952897a1 (diff)
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>
-rw-r--r--ports/rp2/CMakeLists.txt3
-rwxr-xr-xtools/ci.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 160456c6b..bd58d8f70 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 c6b641dae..8661f532e 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
}