misc: Move networking variables to board/port Makefiles.

Some ports will enable/disable these options based on variable not
available in the top Makefile.
This commit is contained in:
iabdalkader 2025-01-04 14:05:35 +01:00
parent cba4d443ce
commit e2e4e2d34e
12 changed files with 90 additions and 58 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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)