From 26b37c100c4774cc67a50f3da31ab09e2daa74db Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Mon, 25 Nov 2019 18:33:01 +0200 Subject: [PATCH] Disable ulab for omv2. --- src/Makefile | 2 ++ src/micropython | 2 +- src/omv/boards/OPENMV3/omv_boardconfig.mk | 1 + src/omv/boards/OPENMV4/omv_boardconfig.mk | 1 + src/omv/boards/OPENMV4R/omv_boardconfig.mk | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 78b0671a2..381112a17 100755 --- a/src/Makefile +++ b/src/Makefile @@ -444,6 +444,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/extmod/,\ modussl_mbedtls.o \ ) +ifeq ($(MICROPY_PY_ULAB), 1) FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/extmod/ulab/,\ code/fft.o \ code/linalg.o \ @@ -453,6 +454,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/extmod/ulab/,\ code/ulab.o \ code/vectorise.o \ ) +endif FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/lib/oofatfs/,\ ff.o \ diff --git a/src/micropython b/src/micropython index 8667381c6..f9268fe47 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 8667381c656314a3ec35f2befcdddd3040fba946 +Subproject commit f9268fe47530885bb212a66b82630cb8738881b0 diff --git a/src/omv/boards/OPENMV3/omv_boardconfig.mk b/src/omv/boards/OPENMV3/omv_boardconfig.mk index a7fb5b1df..9f5b9daa7 100755 --- a/src/omv/boards/OPENMV3/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV3/omv_boardconfig.mk @@ -9,3 +9,4 @@ STARTUP=startup_stm32f765xx VECT_TAB_OFFSET=0x20000 MAIN_APP_ADDR=0x08020000 FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries +MICROPY_PY_ULAB = 1 diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.mk b/src/omv/boards/OPENMV4/omv_boardconfig.mk index f3e77acdf..0ff2d358f 100755 --- a/src/omv/boards/OPENMV4/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4/omv_boardconfig.mk @@ -9,3 +9,4 @@ STARTUP=startup_stm32h743xx VECT_TAB_OFFSET=0x40000 MAIN_APP_ADDR=0x08040000 FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries +MICROPY_PY_ULAB = 1 diff --git a/src/omv/boards/OPENMV4R/omv_boardconfig.mk b/src/omv/boards/OPENMV4R/omv_boardconfig.mk index f3e77acdf..0ff2d358f 100755 --- a/src/omv/boards/OPENMV4R/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4R/omv_boardconfig.mk @@ -9,3 +9,4 @@ STARTUP=startup_stm32h743xx VECT_TAB_OFFSET=0x40000 MAIN_APP_ADDR=0x08040000 FROZEN_MPY_DIR=$(TOP_DIR)/../scripts/libraries +MICROPY_PY_ULAB = 1