From f698bf7d13797bd13b10b6eee2ddcae46d872348 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sat, 4 Jan 2025 14:29:19 +0100 Subject: [PATCH] misc: Rename Makefile variables. --- src/Makefile | 32 +++---- src/omv/common/export.mk | 2 +- src/omv/ports/mimxrt/omv_portconfig.mk | 109 ++++++++++++------------ src/omv/ports/nrf/omv_portconfig.mk | 4 +- src/omv/ports/rp2/omv_portconfig.mk | 6 +- src/omv/ports/stm32/omv_portconfig.mk | 113 +++++++++++++------------ 6 files changed, 134 insertions(+), 132 deletions(-) diff --git a/src/Makefile b/src/Makefile index 32cd165e6..4b0c35db9 100755 --- a/src/Makefile +++ b/src/Makefile @@ -122,76 +122,76 @@ include $(OMV_BOARD_CONFIG_DIR)/omv_boardconfig.mk #OMV_SRC_QSTR := $(wildcard $(TOP_DIR)/$(OMV_DIR)/modules/*.c) # The following command line args are passed to MicroPython's top Makefile. -MICROPY_ARGS = PORT=$(PORT) BOARD=$(TARGET) DEBUG=$(DEBUG) MICROPY_MANIFEST_OMV_LIB_DIR=$(OMV_LIB_DIR)\ - FROZEN_MANIFEST=$(FROZEN_MANIFEST) OMV_SRC_QSTR="$(OMV_SRC_QSTR)"\ - MICROPY_ROM_TEXT_COMPRESSION=$(ROM_TEXT_COMPRESSION) USER_C_MODULES=$(TOP_DIR)/$(OMV_DIR) +MPY_MKARGS = PORT=$(PORT) BOARD=$(TARGET) DEBUG=$(DEBUG) MICROPY_MANIFEST_OMV_LIB_DIR=$(OMV_LIB_DIR)\ + FROZEN_MANIFEST=$(FROZEN_MANIFEST) OMV_SRC_QSTR="$(OMV_SRC_QSTR)"\ + MICROPY_ROM_TEXT_COMPRESSION=$(ROM_TEXT_COMPRESSION) USER_C_MODULES=$(TOP_DIR)/$(OMV_DIR) # Configure additional built-in modules. Note must define both the CFLAGS and the Make command line args. ifeq ($(MICROPY_PY_CSI), 1) MPY_CFLAGS += -DMICROPY_PY_CSI=1 -MICROPY_ARGS += MICROPY_PY_CSI=1 +MPY_MKARGS += MICROPY_PY_CSI=1 endif ifeq ($(MICROPY_PY_WINC1500), 1) MPY_CFLAGS += -DMICROPY_PY_WINC1500=1 -MICROPY_ARGS += MICROPY_PY_WINC1500=1 +MPY_MKARGS += MICROPY_PY_WINC1500=1 MPY_PENDSV_ENTRIES += PENDSV_DISPATCH_WINC, endif ifeq ($(MICROPY_PY_IMU), 1) MPY_CFLAGS += -DMICROPY_PY_IMU=1 -MICROPY_ARGS += MICROPY_PY_IMU=1 +MPY_MKARGS += MICROPY_PY_IMU=1 endif ifeq ($(MICROPY_PY_BTREE), 1) MPY_CFLAGS += -DMICROPY_PY_BTREE=1 -MICROPY_ARGS += MICROPY_PY_BTREE=1 +MPY_MKARGS += MICROPY_PY_BTREE=1 endif ifeq ($(MICROPY_PY_TOF), 1) MPY_CFLAGS += -DMICROPY_PY_TOF=1 -MICROPY_ARGS += MICROPY_PY_TOF=1 +MPY_MKARGS += MICROPY_PY_TOF=1 endif ifeq ($(MICROPY_PY_ULAB), 1) MPY_CFLAGS += -DMICROPY_PY_ULAB=1 MPY_CFLAGS += -DULAB_CONFIG_FILE="\"$(OMV_BOARD_CONFIG_DIR)/ulab_config.h\"" -MICROPY_ARGS += MICROPY_PY_ULAB=1 +MPY_MKARGS += MICROPY_PY_ULAB=1 endif ifeq ($(MICROPY_PY_AUDIO), 1) MPY_CFLAGS += -DMICROPY_PY_AUDIO=1 -MICROPY_ARGS += MICROPY_PY_AUDIO=1 +MPY_MKARGS += MICROPY_PY_AUDIO=1 endif ifeq ($(MICROPY_PY_DISPLAY), 1) MPY_CFLAGS += -DMICROPY_PY_DISPLAY=1 -MICROPY_ARGS += MICROPY_PY_DISPLAY=1 +MPY_MKARGS += MICROPY_PY_DISPLAY=1 endif ifeq ($(MICROPY_PY_TV), 1) MPY_CFLAGS += -DMICROPY_PY_TV=1 -MICROPY_ARGS += MICROPY_PY_TV=1 +MPY_MKARGS += MICROPY_PY_TV=1 endif ifeq ($(MICROPY_PY_BUZZER), 1) MPY_CFLAGS += -DMICROPY_PY_BUZZER=1 -MICROPY_ARGS += MICROPY_PY_BUZZER=1 +MPY_MKARGS += MICROPY_PY_BUZZER=1 endif ifeq ($(CUBEAI), 1) MPY_CFLAGS += -DMICROPY_PY_CUBEAI=1 -MICROPY_ARGS += MICROPY_PY_CUBEAI=1 +MPY_MKARGS += MICROPY_PY_CUBEAI=1 endif ifeq ($(MICROPY_PY_ML), 1) MPY_CFLAGS += -DMICROPY_PY_ML=1 -MICROPY_ARGS += MICROPY_PY_ML=1 +MPY_MKARGS += MICROPY_PY_ML=1 endif ifeq ($(MICROPY_PY_ML_TFLM), 1) MPY_CFLAGS += -DMICROPY_PY_ML_TFLM=1 -MICROPY_ARGS += MICROPY_PY_ML_TFLM=1 +MPY_MKARGS += MICROPY_PY_ML_TFLM=1 endif MPY_PENDSV_ENTRIES := $(shell echo $(MPY_PENDSV_ENTRIES) | tr -d '[:space:]') diff --git a/src/omv/common/export.mk b/src/omv/common/export.mk index 763c18fdf..8128581f8 100644 --- a/src/omv/common/export.mk +++ b/src/omv/common/export.mk @@ -56,7 +56,7 @@ export TARGET export FIRMWARE export SYSTEM export STARTUP -export MICROPY_ARGS +export MPY_MKARGS export VELA_ARGS export FROZEN_MANIFEST diff --git a/src/omv/ports/mimxrt/omv_portconfig.mk b/src/omv/ports/mimxrt/omv_portconfig.mk index 0b1fd71fc..3efd1a854 100644 --- a/src/omv/ports/mimxrt/omv_portconfig.mk +++ b/src/omv/ports/mimxrt/omv_portconfig.mk @@ -79,66 +79,67 @@ LDFLAGS = -mthumb \ -Wl,-T$(BUILD)/$(LDSCRIPT).lds \ -Wl,-Map=$(BUILD)/$(FIRMWARE).map -HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/ +HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/mimxrt -HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/ +HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR) HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/drivers -MPY_CFLAGS += -I$(MP_BOARD_CONFIG_DIR) \ - -I$(BUILD)/$(MICROPY_DIR)/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/py/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/lib/oofatfs \ - -I$(TOP_DIR)/$(MICROPY_DIR)/lib/tinyusb/src \ - -I$(TOP_DIR)/$(MICROPY_DIR)/lib/lwip/src/include/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/shared/tinyusb \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ports/mimxrt/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ports/mimxrt/lwip_inc/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/shared/runtime/ \ - -DMICROPY_PY_LWIP=$(MICROPY_PY_LWIP) \ - -DMICROPY_PY_SSL=$(MICROPY_PY_SSL) \ - -DMICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) \ - -DMICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) \ - -DMICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) \ - -DMICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE) \ - -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1 \ - -DMICROPY_VFS_FAT=1 +MPY_CFLAGS += -I$(MP_BOARD_CONFIG_DIR) +MPY_CFLAGS += -I$(BUILD)/$(MICROPY_DIR) +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR) +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/py +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/lib/oofatfs +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/lib/tinyusb/src +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/lib/lwip/src/include +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/shared/tinyusb +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/mimxrt +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/mimxrt/lwip_inc +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/shared/runtime -MICROPY_ARGS += MCU_DIR=$(TOP_DIR)/$(HAL_DIR) \ - CMSIS_DIR=$(TOP_DIR)/$(CMSIS_DIR)\ - SUPPORTS_HARDWARE_FP_SINGLE=1 \ - MICROPY_VFS_LFS2=0 \ - MICROPY_PY_LWIP=$(MICROPY_PY_LWIP) \ - MICROPY_PY_SSL=$(MICROPY_PY_SSL) \ - MICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) \ - MICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) \ - MICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) \ - MICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE)\ - MICROPY_PY_OPENAMP=$(MICROPY_PY_OPENAMP)\ - MICROPY_PY_OPENAMP_REMOTEPROC=$(MICROPY_PY_OPENAMP_REMOTEPROC) +MPY_CFLAGS += -DMICROPY_PY_LWIP=$(MICROPY_PY_LWIP) +MPY_CFLAGS += -DMICROPY_PY_SSL=$(MICROPY_PY_SSL) +MPY_CFLAGS += -DMICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) +MPY_CFLAGS += -DMICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) +MPY_CFLAGS += -DMICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) +MPY_CFLAGS += -DMICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE) +MPY_CFLAGS += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1 +MPY_CFLAGS += -DMICROPY_VFS_FAT=1 + +MPY_MKARGS += MCU_DIR=$(TOP_DIR)/$(HAL_DIR) +MPY_MKARGS += CMSIS_DIR=$(TOP_DIR)/$(CMSIS_DIR) +MPY_MKARGS += SUPPORTS_HARDWARE_FP_SINGLE=1 +MPY_MKARGS += MICROPY_VFS_LFS2=0 +MPY_MKARGS += MICROPY_PY_LWIP=$(MICROPY_PY_LWIP) +MPY_MKARGS += MICROPY_PY_SSL=$(MICROPY_PY_SSL) +MPY_MKARGS += MICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) +MPY_MKARGS += MICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) +MPY_MKARGS += MICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) +MPY_MKARGS += MICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE) +MPY_MKARGS += MICROPY_PY_OPENAMP=$(MICROPY_PY_OPENAMP) +MPY_MKARGS += MICROPY_PY_OPENAMP_REMOTEPROC=$(MICROPY_PY_OPENAMP_REMOTEPROC) OMV_CFLAGS += -I$(OMV_BOARD_CONFIG_DIR) -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/alloc/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/common/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/imlib/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/modules/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/sensors/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/templates/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/modules/ +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR) +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/alloc +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/common +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/imlib +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/modules +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/sensors +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/templates +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT) +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/modules -OMV_CFLAGS += -I$(TOP_DIR)/$(GENX320_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(BOSON_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(LEPTON_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DS3_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DSOX_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(VL53L5CX_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(WINC1500_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90621_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90640_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90641_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(PIXART_DIR)/include/ +OMV_CFLAGS += -I$(TOP_DIR)/$(GENX320_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(BOSON_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(LEPTON_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DS3_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DSOX_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(VL53L5CX_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(WINC1500_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90621_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90640_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90641_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(PIXART_DIR)/include CFLAGS += $(HAL_CFLAGS) $(MPY_CFLAGS) $(OMV_CFLAGS) @@ -573,7 +574,7 @@ FIRMWARE_OBJS: | $(BUILD) $(FW_DIR) ifeq ($(MICROPY_PY_ML_TFLM), 1) $(MAKE) -C $(TENSORFLOW_DIR) BUILD=$(BUILD)/$(TENSORFLOW_DIR) CFLAGS="$(CFLAGS) -MMD" headers endif - $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) BUILD=$(BUILD)/$(MICROPY_DIR) $(MICROPY_ARGS) + $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) BUILD=$(BUILD)/$(MICROPY_DIR) $(MPY_MKARGS) $(MAKE) -C $(GENX320_DIR) BUILD=$(BUILD)/$(GENX320_DIR) CFLAGS="$(CFLAGS) -MMD" $(MAKE) -C $(BOSON_DIR) BUILD=$(BUILD)/$(BOSON_DIR) CFLAGS="$(CFLAGS) -MMD" $(MAKE) -C $(LEPTON_DIR) BUILD=$(BUILD)/$(LEPTON_DIR) CFLAGS="$(CFLAGS) -MMD" diff --git a/src/omv/ports/nrf/omv_portconfig.mk b/src/omv/ports/nrf/omv_portconfig.mk index d0c55be82..e6335a127 100644 --- a/src/omv/ports/nrf/omv_portconfig.mk +++ b/src/omv/ports/nrf/omv_portconfig.mk @@ -55,7 +55,7 @@ CFLAGS += -D$(MCU) \ $(OMV_BOARD_CFLAGS) # Disable LTO and set the SD -MICROPY_ARGS += LTO=0 SD=$(SD) +MPY_MKARGS += LTO=0 SD=$(SD) HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/ HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/nrf @@ -425,7 +425,7 @@ $(FW_DIR): FIRMWARE_OBJS: | $(BUILD) $(FW_DIR) $(MAKE) -C $(CMSIS_DIR) BUILD=$(BUILD)/$(CMSIS_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing -MMD" - $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) BUILD=$(BUILD)/$(MICROPY_DIR) $(MICROPY_ARGS) + $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) BUILD=$(BUILD)/$(MICROPY_DIR) $(MPY_MKARGS) $(MAKE) -C $(HAL_DIR) BUILD=$(BUILD)/$(HAL_DIR) CFLAGS="$(CFLAGS) -MMD" $(MAKE) -C $(MLX90621_DIR) BUILD=$(BUILD)/$(MLX90621_DIR) CFLAGS="$(CFLAGS) -MMD" $(MAKE) -C $(MLX90640_DIR) BUILD=$(BUILD)/$(MLX90640_DIR) CFLAGS="$(CFLAGS) -MMD" diff --git a/src/omv/ports/rp2/omv_portconfig.mk b/src/omv/ports/rp2/omv_portconfig.mk index 00f360931..7e68714b5 100644 --- a/src/omv/ports/rp2/omv_portconfig.mk +++ b/src/omv/ports/rp2/omv_portconfig.mk @@ -27,14 +27,14 @@ export CC= export CXX= # Note this overrides USER_C_MODULES. -MICROPY_ARGS += BOARD=$(TARGET) BUILD=$(BUILD)/rp2 USER_C_MODULES="" \ - OMV_CMAKE=$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/omv_portconfig.cmake +MPY_MKARGS += BOARD=$(TARGET) BUILD=$(BUILD)/rp2 USER_C_MODULES="" \ + OMV_CMAKE=$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/omv_portconfig.cmake ################################################### all: $(OPENMV) $(FIRMWARE): - $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) $(MICROPY_ARGS) + $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) $(MPY_MKARGS) # This target generates the firmware image. $(OPENMV): $(FIRMWARE) diff --git a/src/omv/ports/stm32/omv_portconfig.mk b/src/omv/ports/stm32/omv_portconfig.mk index 8873af2fc..2a1655c46 100644 --- a/src/omv/ports/stm32/omv_portconfig.mk +++ b/src/omv/ports/stm32/omv_portconfig.mk @@ -73,67 +73,68 @@ LDFLAGS = -mthumb \ -Wl,-T$(BUILD)/$(LDSCRIPT).lds \ -Wl,-Map=$(BUILD)/$(FIRMWARE).map -HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/ +HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/st -HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/ -HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/Legacy/ +HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include +HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/Legacy -MPY_CFLAGS += -I$(MP_BOARD_CONFIG_DIR) \ - -I$(BUILD)/$(MICROPY_DIR)/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/py/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/lib/oofatfs \ - -I$(TOP_DIR)/$(MICROPY_DIR)/lib/lwip/src/include/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/lib/mbedtls/include \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/core/inc/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/class/inc/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/lwip_inc/ \ - -I$(TOP_DIR)/$(MICROPY_DIR)/shared/runtime/ \ - -DMICROPY_PY_LWIP=$(MICROPY_PY_LWIP) \ - -DMICROPY_PY_SSL=$(MICROPY_PY_SSL) \ - -DMICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) \ - -DMICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) \ - -DMICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) \ - -DMICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE) \ - -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1 \ - -DMICROPY_STREAMS_POSIX_API=1 - -DMICROPY_VFS_FAT=1 \ +MPY_CFLAGS += -I$(MP_BOARD_CONFIG_DIR) +MPY_CFLAGS += -I$(BUILD)/$(MICROPY_DIR) +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR) +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/py +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/lib/oofatfs +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/lib/lwip/src/include +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/lib/mbedtls/include +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32 +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/core/inc +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/usbdev/class/inc +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/lwip_inc +MPY_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/shared/runtime -MICROPY_ARGS += STM32LIB_CMSIS_DIR=$(TOP_DIR)/$(CMSIS_DIR) \ - STM32LIB_HAL_DIR=$(TOP_DIR)/$(HAL_DIR) \ - MICROPY_PY_LWIP=$(MICROPY_PY_LWIP) \ - MICROPY_PY_SSL=$(MICROPY_PY_SSL) \ - MICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) \ - MICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) \ - MICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) \ - MICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE)\ - MICROPY_PY_OPENAMP=$(MICROPY_PY_OPENAMP)\ - MICROPY_PY_OPENAMP_REMOTEPROC=$(MICROPY_PY_OPENAMP_REMOTEPROC) +MPY_CFLAGS += -DMICROPY_PY_LWIP=$(MICROPY_PY_LWIP) +MPY_CFLAGS += -DMICROPY_PY_SSL=$(MICROPY_PY_SSL) +MPY_CFLAGS += -DMICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) +MPY_CFLAGS += -DMICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) +MPY_CFLAGS += -DMICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) +MPY_CFLAGS += -DMICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE) +MPY_CFLAGS += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1 +MPY_CFLAGS += -DMICROPY_STREAMS_POSIX_API=1 +MPY_CFLAGS += -DMICROPY_VFS_FAT=1 + +MPY_MKARGS += STM32LIB_CMSIS_DIR=$(TOP_DIR)/$(CMSIS_DIR) +MPY_MKARGS += STM32LIB_HAL_DIR=$(TOP_DIR)/$(HAL_DIR) +MPY_MKARGS += MICROPY_PY_LWIP=$(MICROPY_PY_LWIP) +MPY_MKARGS += MICROPY_PY_SSL=$(MICROPY_PY_SSL) +MPY_MKARGS += MICROPY_SSL_MBEDTLS=$(MICROPY_SSL_MBEDTLS) +MPY_MKARGS += MICROPY_PY_NETWORK_CYW43=$(MICROPY_PY_NETWORK_CYW43) +MPY_MKARGS += MICROPY_PY_BLUETOOTH=$(MICROPY_PY_BLUETOOTH) +MPY_MKARGS += MICROPY_BLUETOOTH_NIMBLE=$(MICROPY_BLUETOOTH_NIMBLE) +MPY_MKARGS += MICROPY_PY_OPENAMP=$(MICROPY_PY_OPENAMP) +MPY_MKARGS += MICROPY_PY_OPENAMP_REMOTEPROC=$(MICROPY_PY_OPENAMP_REMOTEPROC) OMV_CFLAGS += -I$(OMV_BOARD_CONFIG_DIR) -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/alloc/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/common/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/imlib/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/modules/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/sensors/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/ -OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/modules/ +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR) +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/alloc +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/common +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/imlib +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/modules +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/sensors +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT) +OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/ports/$(PORT)/modules -OMV_CFLAGS += -I$(TOP_DIR)/$(GENX320_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(BOSON_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(LEPTON_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DS3_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DSOX_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(VL53L5CX_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(WINC1500_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90621_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90640_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90641_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(PIXART_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(DISPLAY_DIR)/include/ -OMV_CFLAGS += -I$(TOP_DIR)/$(LIBPDM_DIR)/ +OMV_CFLAGS += -I$(TOP_DIR)/$(GENX320_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(BOSON_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(LEPTON_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DS3_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DSOX_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(VL53L5CX_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(WINC1500_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90621_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90640_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(MLX90641_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(PIXART_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(DISPLAY_DIR)/include +OMV_CFLAGS += -I$(TOP_DIR)/$(LIBPDM_DIR) OMV_CFLAGS += -I$(TOP_DIR)/$(NEMA_DIR)/include ifeq ($(OMV_ENABLE_UVC), 1) @@ -692,7 +693,7 @@ FIRMWARE_OBJS: | $(BUILD) $(FW_DIR) ifeq ($(MICROPY_PY_ML_TFLM), 1) $(MAKE) -C $(TENSORFLOW_DIR) BUILD=$(BUILD)/$(TENSORFLOW_DIR) CFLAGS="$(CFLAGS) -MMD" headers endif - $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) BUILD=$(BUILD)/$(MICROPY_DIR) $(MICROPY_ARGS) + $(MAKE) -C $(MICROPY_DIR)/ports/$(PORT) BUILD=$(BUILD)/$(MICROPY_DIR) $(MPY_MKARGS) $(MAKE) -C $(GENX320_DIR) BUILD=$(BUILD)/$(GENX320_DIR) CFLAGS="$(CFLAGS) -MMD" $(MAKE) -C $(BOSON_DIR) BUILD=$(BUILD)/$(BOSON_DIR) CFLAGS="$(CFLAGS) -MMD" $(MAKE) -C $(LEPTON_DIR) BUILD=$(BUILD)/$(LEPTON_DIR) CFLAGS="$(CFLAGS) -MMD"