mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Merge pull request #2592 from openmv/move_submodule
Some checks failed
🔎 Check Code Formatting / formatting-check (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_GIGA) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NANO_33_BLE_SENSE) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NANO_RP2040_CONNECT) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NICLA_VISION) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_PORTENTA_H7) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV2) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV3) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV4) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV4P) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMVPT) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV_RT1060) (push) Has been cancelled
🔥 Firmware Build / code-size-report (push) Has been cancelled
🔥 Firmware Build / stable-release (push) Has been cancelled
🔥 Firmware Build / development-release (push) Has been cancelled
Some checks failed
🔎 Check Code Formatting / formatting-check (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_GIGA) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NANO_33_BLE_SENSE) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NANO_RP2040_CONNECT) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_NICLA_VISION) (push) Has been cancelled
🔥 Firmware Build / build-firmware (ARDUINO_PORTENTA_H7) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV2) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV3) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV4) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV4P) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMVPT) (push) Has been cancelled
🔥 Firmware Build / build-firmware (OPENMV_RT1060) (push) Has been cancelled
🔥 Firmware Build / code-size-report (push) Has been cancelled
🔥 Firmware Build / stable-release (push) Has been cancelled
🔥 Firmware Build / development-release (push) Has been cancelled
micropython: Move submodule to lib.
This commit is contained in:
commit
1962f4ba7a
2
.github/workflows/codeformat.yml
vendored
2
.github/workflows/codeformat.yml
vendored
@ -49,7 +49,7 @@ jobs:
|
|||||||
!src/hal/**
|
!src/hal/**
|
||||||
!src/lib/**
|
!src/lib/**
|
||||||
!src/drivers/**
|
!src/drivers/**
|
||||||
!src/micropython/**
|
!src/lib/micropython/**
|
||||||
!src/stm32cubeai/**
|
!src/stm32cubeai/**
|
||||||
!src/omv/ports/stm32/uvc/**
|
!src/omv/ports/stm32/uvc/**
|
||||||
!src/omv/ports/stm32/boot/**
|
!src/omv/ports/stm32/boot/**
|
||||||
|
|||||||
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,5 +1,5 @@
|
|||||||
[submodule "src/micropython"]
|
[submodule "src/micropython"]
|
||||||
path = src/micropython
|
path = src/lib/micropython
|
||||||
url = https://github.com/openmv/micropython.git
|
url = https://github.com/openmv/micropython.git
|
||||||
branch = openmv
|
branch = openmv
|
||||||
[submodule "src/omv/modules/ulab"]
|
[submodule "src/omv/modules/ulab"]
|
||||||
|
|||||||
@ -32,7 +32,7 @@ STRIP = $(Q)arm-none-eabi-strip -s
|
|||||||
OBJCOPY = $(Q)arm-none-eabi-objcopy
|
OBJCOPY = $(Q)arm-none-eabi-objcopy
|
||||||
OBJDUMP = $(Q)arm-none-eabi-objdump
|
OBJDUMP = $(Q)arm-none-eabi-objdump
|
||||||
PYTHON = $(Q)python3
|
PYTHON = $(Q)python3
|
||||||
MKDFU = micropython/tools/dfu.py
|
MKDFU = $(MICROPY_DIR)/tools/dfu.py
|
||||||
PYDFU = $(Q)../tools/pydfu.py
|
PYDFU = $(Q)../tools/pydfu.py
|
||||||
MKDIR = $(Q)mkdir
|
MKDIR = $(Q)mkdir
|
||||||
ECHO = $(Q)@echo
|
ECHO = $(Q)@echo
|
||||||
@ -54,7 +54,7 @@ OMV_DIR=omv
|
|||||||
BOOT_DIR=boot
|
BOOT_DIR=boot
|
||||||
CUBEAI_DIR=stm32cubeai
|
CUBEAI_DIR=stm32cubeai
|
||||||
CMSIS_DIR=hal/cmsis
|
CMSIS_DIR=hal/cmsis
|
||||||
MICROPY_DIR=micropython
|
MICROPY_DIR=lib/micropython
|
||||||
GENX320_DIR=drivers/genx320
|
GENX320_DIR=drivers/genx320
|
||||||
BOSON_DIR=drivers/boson
|
BOSON_DIR=drivers/boson
|
||||||
LEPTON_DIR=drivers/lepton
|
LEPTON_DIR=drivers/lepton
|
||||||
|
|||||||
@ -38,8 +38,8 @@ ci_install_gnu_make() {
|
|||||||
|
|
||||||
ci_update_submodules() {
|
ci_update_submodules() {
|
||||||
git submodule update --init --depth=1 --no-single-branch
|
git submodule update --init --depth=1 --no-single-branch
|
||||||
git -C src/micropython/ submodule update --init --depth=1
|
git -C src/lib/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)
|
# (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() {
|
ci_build_target() {
|
||||||
export PATH=${GNU_MAKE_PATH}:${GCC_TOOLCHAIN_PATH}/bin:${PATH}
|
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
|
make -j$(nproc) TARGET=${1} LLVM_PATH=${LLVM_TOOLCHAIN_PATH}/bin -C src
|
||||||
mv src/build/bin ${1}
|
mv src/build/bin ${1}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user