From 757d783049b37fed22e120a78602e85dd17dd2de Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 30 Oct 2019 21:02:51 +0200 Subject: [PATCH 1/2] Freeze all the modules in scripts/libraries. --- src/Makefile | 1 + src/omv/boards/OPENMV3/omv_boardconfig.mk | 1 + src/omv/boards/OPENMV4/omv_boardconfig.mk | 1 + src/omv/boards/OPENMV4R/omv_boardconfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/src/Makefile b/src/Makefile index 513d20638..8da168faf 100755 --- a/src/Makefile +++ b/src/Makefile @@ -538,6 +538,7 @@ export TOP_DIR export BUILD export TARGET export STARTUP +export FROZEN_MPY_DIR ################################################### all: $(OPENMV) diff --git a/src/omv/boards/OPENMV3/omv_boardconfig.mk b/src/omv/boards/OPENMV3/omv_boardconfig.mk index 7336ae779..a7fb5b1df 100755 --- a/src/omv/boards/OPENMV3/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV3/omv_boardconfig.mk @@ -8,3 +8,4 @@ CFLAGS_MCU=MCU_SERIES_F7 STARTUP=startup_stm32f765xx VECT_TAB_OFFSET=0x20000 MAIN_APP_ADDR=0x08020000 +FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.mk b/src/omv/boards/OPENMV4/omv_boardconfig.mk index a77bd18f0..f3e77acdf 100755 --- a/src/omv/boards/OPENMV4/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4/omv_boardconfig.mk @@ -8,3 +8,4 @@ CFLAGS_MCU=MCU_SERIES_H7 STARTUP=startup_stm32h743xx VECT_TAB_OFFSET=0x40000 MAIN_APP_ADDR=0x08040000 +FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries diff --git a/src/omv/boards/OPENMV4R/omv_boardconfig.mk b/src/omv/boards/OPENMV4R/omv_boardconfig.mk index a77bd18f0..f3e77acdf 100755 --- a/src/omv/boards/OPENMV4R/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4R/omv_boardconfig.mk @@ -8,3 +8,4 @@ CFLAGS_MCU=MCU_SERIES_H7 STARTUP=startup_stm32h743xx VECT_TAB_OFFSET=0x40000 MAIN_APP_ADDR=0x08040000 +FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries From a44985216bf09515f86df223c195fe7b8b60ed3e Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 30 Oct 2019 21:43:05 +0200 Subject: [PATCH 2/2] Update Travis CI script. * Seems mpy-cross does not get built in the right time. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e1fa96e65..0f82c60ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ script: - popd - arm-none-eabi-gcc --version # build firmware + - make -j5 -C src/micropython/mpy-cross - make -j5 TARGET=$TARGET -C src - mkdir ~/build/$TARGET - cp -r src/build/bin/* ~/build/$TARGET