From 4d3eeae2cc4ca8b32b3f2184a7e70a772e0102e0 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 2 Feb 2025 10:09:56 +0100 Subject: [PATCH] micropython: Move submodule to lib. Signed-off-by: iabdalkader --- .github/workflows/codeformat.yml | 2 +- .gitmodules | 2 +- src/Makefile | 4 ++-- src/{ => lib}/micropython | 0 tools/ci.sh | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/{ => lib}/micropython (100%) diff --git a/.github/workflows/codeformat.yml b/.github/workflows/codeformat.yml index 6eb47deac..45529931b 100644 --- a/.github/workflows/codeformat.yml +++ b/.github/workflows/codeformat.yml @@ -49,7 +49,7 @@ jobs: !src/hal/** !src/lib/** !src/drivers/** - !src/micropython/** + !src/lib/micropython/** !src/stm32cubeai/** !src/omv/ports/stm32/uvc/** !src/omv/ports/stm32/boot/** diff --git a/.gitmodules b/.gitmodules index 3ac14cffb..0a2666262 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "src/micropython"] - path = src/micropython + path = src/lib/micropython url = https://github.com/openmv/micropython.git branch = openmv [submodule "src/omv/modules/ulab"] diff --git a/src/Makefile b/src/Makefile index 4b0c35db9..2dc26ac6a 100755 --- a/src/Makefile +++ b/src/Makefile @@ -32,7 +32,7 @@ STRIP = $(Q)arm-none-eabi-strip -s OBJCOPY = $(Q)arm-none-eabi-objcopy OBJDUMP = $(Q)arm-none-eabi-objdump PYTHON = $(Q)python3 -MKDFU = micropython/tools/dfu.py +MKDFU = $(MICROPY_DIR)/tools/dfu.py PYDFU = $(Q)../tools/pydfu.py MKDIR = $(Q)mkdir ECHO = $(Q)@echo @@ -54,7 +54,7 @@ OMV_DIR=omv BOOT_DIR=boot CUBEAI_DIR=stm32cubeai CMSIS_DIR=hal/cmsis -MICROPY_DIR=micropython +MICROPY_DIR=lib/micropython GENX320_DIR=drivers/genx320 BOSON_DIR=drivers/boson LEPTON_DIR=drivers/lepton diff --git a/src/micropython b/src/lib/micropython similarity index 100% rename from src/micropython rename to src/lib/micropython diff --git a/tools/ci.sh b/tools/ci.sh index 93ed3d709..d562e40a2 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -38,8 +38,8 @@ ci_install_gnu_make() { ci_update_submodules() { git submodule update --init --depth=1 --no-single-branch - git -C src/micropython/ submodule update --init --depth=1 -# (cd src/micropython/ && for remote in `git branch -r | grep -v /HEAD | grep -v master`; do git checkout --track $remote ; done) + git -C src/lib/micropython/ submodule update --init --depth=1 +# (cd src/lib/micropython/ && for remote in `git branch -r | grep -v /HEAD | grep -v master`; do git checkout --track $remote ; done) } ######################################################################################## @@ -47,7 +47,7 @@ ci_update_submodules() { ci_build_target() { export PATH=${GNU_MAKE_PATH}:${GCC_TOOLCHAIN_PATH}/bin:${PATH} - make -j$(nproc) -C src/micropython/mpy-cross + make -j$(nproc) -C src/lib/micropython/mpy-cross make -j$(nproc) TARGET=${1} LLVM_PATH=${LLVM_TOOLCHAIN_PATH}/bin -C src mv src/build/bin ${1} }