summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2022-04-11 13:04:31 +1000
committerDamien George <damien@micropython.org>2022-04-11 13:05:25 +1000
commitb59989f40edeca1a7c239eb017c353010e1837d7 (patch)
tree3fab026e511b425ca793dc6d60b778be9f4e9c4a
parentca41eda281052ecf64374f35dcf282a96e68661a (diff)
rp2/Makefile: Add mbedtls to GIT_SUBMODULES list and use it in CI func.
Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--ports/rp2/Makefile2
-rwxr-xr-xtools/ci.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 2d1e6d6f5..461a27aca 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -25,7 +25,7 @@ all:
clean:
$(RM) -rf $(BUILD)
-GIT_SUBMODULES += lib/pico-sdk lib/tinyusb
+GIT_SUBMODULES += lib/mbedtls lib/pico-sdk lib/tinyusb
submodules:
$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
diff --git a/tools/ci.sh b/tools/ci.sh
index 98c95465c..bf60d788a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -256,7 +256,7 @@ function ci_rp2_setup {
function ci_rp2_build {
make ${MAKEOPTS} -C mpy-cross
- git submodule update --init lib/mbedtls lib/pico-sdk lib/tinyusb
+ make ${MAKEOPTS} -C ports/rp2 submodules
make ${MAKEOPTS} -C ports/rp2
make ${MAKEOPTS} -C ports/rp2 clean
make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake