From e2e4e2d34e3fb08dce69444639f2f9ab30a816f6 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sat, 4 Jan 2025 14:05:35 +0100 Subject: [PATCH] misc: Move networking variables to board/port Makefiles. Some ports will enable/disable these options based on variable not available in the top Makefile. --- src/Makefile | 21 --------- .../boards/ARDUINO_GIGA/omv_boardconfig.mk | 2 + .../ARDUINO_NICLA_VISION/omv_boardconfig.mk | 2 + .../ARDUINO_PORTENTA_H7/omv_boardconfig.mk | 2 + src/omv/boards/OPENMV2/omv_boardconfig.mk | 6 +++ src/omv/boards/OPENMV3/omv_boardconfig.mk | 6 +++ src/omv/boards/OPENMV4/omv_boardconfig.mk | 6 +++ src/omv/boards/OPENMV4P/omv_boardconfig.mk | 6 +++ src/omv/boards/OPENMVPT/omv_boardconfig.mk | 6 +++ .../boards/OPENMV_RT1060/omv_boardconfig.mk | 2 + src/omv/ports/mimxrt/omv_portconfig.mk | 43 +++++++++-------- src/omv/ports/stm32/omv_portconfig.mk | 46 +++++++++++-------- 12 files changed, 90 insertions(+), 58 deletions(-) diff --git a/src/Makefile b/src/Makefile index 19dcc2134..32cd165e6 100755 --- a/src/Makefile +++ b/src/Makefile @@ -159,27 +159,6 @@ MPY_CFLAGS += -DULAB_CONFIG_FILE="\"$(OMV_BOARD_CONFIG_DIR)/ulab_config.h\"" MICROPY_ARGS += MICROPY_PY_ULAB=1 endif -ifeq ($(MICROPY_PY_LWIP), 1) -MPY_CFLAGS += -DMICROPY_PY_LWIP=1 -MICROPY_ARGS += MICROPY_PY_LWIP=1 -endif - -ifeq ($(MICROPY_PY_NETWORK_CYW43), 1) -MPY_CFLAGS += -DMICROPY_PY_NETWORK_CYW43=1 -MICROPY_ARGS += MICROPY_PY_NETWORK_CYW43=1 -endif - -ifeq ($(MICROPY_PY_BLUETOOTH), 1) -MPY_CFLAGS += -DMICROPY_PY_BLUETOOTH=1 -MICROPY_ARGS += MICROPY_PY_BLUETOOTH=1 -endif - -ifeq ($(MICROPY_BLUETOOTH_NIMBLE), 1) -MPY_CFLAGS += -DMICROPY_BLUETOOTH_NIMBLE=1 -MPY_CFLAGS += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1 -MICROPY_ARGS += MICROPY_BLUETOOTH_NIMBLE=1 -endif - ifeq ($(MICROPY_PY_AUDIO), 1) MPY_CFLAGS += -DMICROPY_PY_AUDIO=1 MICROPY_ARGS += MICROPY_PY_AUDIO=1 diff --git a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk index c57acb3fe..86e294b64 100755 --- a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk @@ -16,6 +16,8 @@ OMV_ENABLE_UVC=1 MICROPY_PY_CSI = 1 MICROPY_PY_ULAB = 1 MICROPY_PY_LWIP = 1 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 MICROPY_PY_NETWORK_CYW43 = 1 MICROPY_PY_BLUETOOTH = 1 MICROPY_BLUETOOTH_NIMBLE = 1 diff --git a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk index db34476a8..ddda7169e 100755 --- a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk @@ -19,6 +19,8 @@ MICROPY_PY_ULAB = 1 MICROPY_PY_WINC1500 = 0 MICROPY_PY_IMU = 1 MICROPY_PY_LWIP = 1 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 MICROPY_PY_NETWORK_CYW43 = 1 MICROPY_PY_BLUETOOTH = 1 MICROPY_BLUETOOTH_NIMBLE = 1 diff --git a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk index 10dc981a9..683753a43 100755 --- a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk @@ -17,6 +17,8 @@ MICROPY_PY_CSI = 1 MICROPY_PY_ULAB = 1 MICROPY_PY_WINC1500 = 0 MICROPY_PY_LWIP = 1 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 MICROPY_PY_NETWORK_CYW43 = 1 MICROPY_PY_BLUETOOTH = 1 MICROPY_BLUETOOTH_NIMBLE = 1 diff --git a/src/omv/boards/OPENMV2/omv_boardconfig.mk b/src/omv/boards/OPENMV2/omv_boardconfig.mk index afb15cbd3..9b51236ef 100755 --- a/src/omv/boards/OPENMV2/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV2/omv_boardconfig.mk @@ -14,3 +14,9 @@ MICROPY_PY_WINC1500 = 1 MICROPY_PY_DISPLAY = 1 MICROPY_PY_TV = 1 MICROPY_PY_BUZZER = 0 +MICROPY_PY_LWIP = 0 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 +MICROPY_PY_NETWORK_CYW43 = 0 +MICROPY_PY_BLUETOOTH = 0 +MICROPY_BLUETOOTH_NIMBLE = 0 diff --git a/src/omv/boards/OPENMV3/omv_boardconfig.mk b/src/omv/boards/OPENMV3/omv_boardconfig.mk index 75264759e..fe7aa3450 100755 --- a/src/omv/boards/OPENMV3/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV3/omv_boardconfig.mk @@ -17,3 +17,9 @@ MICROPY_PY_TV = 1 MICROPY_PY_BUZZER = 0 MICROPY_PY_ML = 1 MICROPY_PY_ML_TFLM = 1 +MICROPY_PY_LWIP = 0 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 +MICROPY_PY_NETWORK_CYW43 = 0 +MICROPY_PY_BLUETOOTH = 0 +MICROPY_BLUETOOTH_NIMBLE = 0 diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.mk b/src/omv/boards/OPENMV4/omv_boardconfig.mk index 7dd45f1bf..b59f617e9 100755 --- a/src/omv/boards/OPENMV4/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4/omv_boardconfig.mk @@ -17,3 +17,9 @@ MICROPY_PY_TV = 1 MICROPY_PY_BUZZER = 0 MICROPY_PY_ML = 1 MICROPY_PY_ML_TFLM = 1 +MICROPY_PY_LWIP = 0 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 +MICROPY_PY_NETWORK_CYW43 = 0 +MICROPY_PY_BLUETOOTH = 0 +MICROPY_BLUETOOTH_NIMBLE = 0 diff --git a/src/omv/boards/OPENMV4P/omv_boardconfig.mk b/src/omv/boards/OPENMV4P/omv_boardconfig.mk index 7dd45f1bf..b59f617e9 100755 --- a/src/omv/boards/OPENMV4P/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4P/omv_boardconfig.mk @@ -17,3 +17,9 @@ MICROPY_PY_TV = 1 MICROPY_PY_BUZZER = 0 MICROPY_PY_ML = 1 MICROPY_PY_ML_TFLM = 1 +MICROPY_PY_LWIP = 0 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 +MICROPY_PY_NETWORK_CYW43 = 0 +MICROPY_PY_BLUETOOTH = 0 +MICROPY_BLUETOOTH_NIMBLE = 0 diff --git a/src/omv/boards/OPENMVPT/omv_boardconfig.mk b/src/omv/boards/OPENMVPT/omv_boardconfig.mk index e93810424..253fd17e3 100755 --- a/src/omv/boards/OPENMVPT/omv_boardconfig.mk +++ b/src/omv/boards/OPENMVPT/omv_boardconfig.mk @@ -17,3 +17,9 @@ MICROPY_PY_TV = 1 MICROPY_PY_BUZZER = 1 MICROPY_PY_ML = 1 MICROPY_PY_ML_TFLM = 1 +MICROPY_PY_LWIP = 0 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 +MICROPY_PY_NETWORK_CYW43 = 0 +MICROPY_PY_BLUETOOTH = 0 +MICROPY_BLUETOOTH_NIMBLE = 0 diff --git a/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk b/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk index 9d96a393f..5d8c0d1e3 100755 --- a/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk @@ -10,6 +10,8 @@ OMV_HSE_VALUE=12000000 MICROPY_PY_CSI = 1 MICROPY_PY_ULAB = 1 MICROPY_PY_LWIP = 1 +MICROPY_PY_SSL = 1 +MICROPY_SSL_MBEDTLS = 1 MICROPY_PY_NETWORK_CYW43 = 1 MICROPY_PY_BLUETOOTH = 1 MICROPY_BLUETOOTH_NIMBLE = 1 diff --git a/src/omv/ports/mimxrt/omv_portconfig.mk b/src/omv/ports/mimxrt/omv_portconfig.mk index 8a761e66b..0b1fd71fc 100644 --- a/src/omv/ports/mimxrt/omv_portconfig.mk +++ b/src/omv/ports/mimxrt/omv_portconfig.mk @@ -84,29 +84,36 @@ HAL_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/mimxrt HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/ HAL_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/drivers -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/ -MPY_CFLAGS += -DMICROPY_VFS_FAT=1 +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 -ifeq ($(MICROPY_PY_LWIP), 0) -MICROPY_ARGS += MICROPY_PY_LWIP=0 MICROPY_PY_SSL=0 -else -MPY_CFLAGS += -DMICROPY_PY_SSL=1 -DMICROPY_SSL_MBEDTLS=1 -MICROPY_ARGS += MICROPY_PY_SSL=1 MICROPY_SSL_MBEDTLS=1 -endif 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) diff --git a/src/omv/ports/stm32/omv_portconfig.mk b/src/omv/ports/stm32/omv_portconfig.mk index e19e5af15..8873af2fc 100644 --- a/src/omv/ports/stm32/omv_portconfig.mk +++ b/src/omv/ports/stm32/omv_portconfig.mk @@ -78,28 +78,36 @@ 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/ -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/ -MPY_CFLAGS += -DMICROPY_PY_SSL=1 \ - -DMICROPY_SSL_MBEDTLS=1 \ - -DMICROPY_STREAMS_POSIX_API=1 \ - -DMICROPY_VFS_FAT=1 - +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 \ MICROPY_ARGS += STM32LIB_CMSIS_DIR=$(TOP_DIR)/$(CMSIS_DIR) \ STM32LIB_HAL_DIR=$(TOP_DIR)/$(HAL_DIR) \ - MICROPY_PY_SSL=1 \ - MICROPY_SSL_MBEDTLS=1 \ + 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)