From 3e65b1cc4fbed80c08fc734e85cc74ef7c284f7c Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 3 Nov 2024 08:46:42 +0100 Subject: [PATCH] boards/All: Clean up board Make flags. --- src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk | 4 ---- .../boards/ARDUINO_NANO_33_BLE_SENSE/omv_boardconfig.mk | 8 +++----- src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk | 4 ---- src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk | 4 ---- src/omv/boards/OPENMV1/omv_boardconfig.mk | 5 +---- 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 ------ src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk | 5 +---- src/omv/boards/RPI_PICO/omv_boardconfig.mk | 1 + 12 files changed, 6 insertions(+), 55 deletions(-) create mode 100755 src/omv/boards/RPI_PICO/omv_boardconfig.mk diff --git a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk index ab4aa2ecb..b1b0c9587 100755 --- a/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_GIGA/omv_boardconfig.mk @@ -2,10 +2,6 @@ MCU=STM32H747xx CPU=cortex-m7 FPU=fpv5-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/h7 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_H7 OMV_FIRM_BASE=0x08040000 OMV_HSE_VALUE=16000000 DFU_DEVICE=0x2341:0x035b diff --git a/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/omv_boardconfig.mk b/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/omv_boardconfig.mk index 078d35b58..322027dea 100755 --- a/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_NANO_33_BLE_SENSE/omv_boardconfig.mk @@ -3,17 +3,15 @@ CPU=cortex-m4 FPU=fpv4-sp-d16 PORT=nrf SD=s140 -HAL_DIR=hal/nrfx -CMSIS_MCU_H='' NRF_SOFTDEV=s140_nrf52_6.1.1 -CFLAGS_MCU=NRF52_SERIES OMV_FIRM_BASE=0x00026000 OMV_HSE_VALUE=12000000 -OMV_BOARD_CFLAGS = -DCONFIG_GPIO_AS_PINRESET \ +OMV_BOARD_CFLAGS = -DNRF52_SERIES \ -DNRF52840_XXAA \ -DSOFTDEVICE_PRESENT \ -DBLUETOOTH_SD_DEBUG=1 \ - -DBLUETOOTH_SD=140 + -DBLUETOOTH_SD=140 \ + -DCONFIG_GPIO_AS_PINRESET DFU_DEVICE=0x0483:0xdf11 MICROPY_PY_ULAB=1 MICROPY_PY_AUDIO=1 diff --git a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk index 8e5a743fa..bd68cc293 100755 --- a/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_NICLA_VISION/omv_boardconfig.mk @@ -2,10 +2,6 @@ MCU=STM32H747xx CPU=cortex-m7 FPU=fpv5-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/h7 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_H7 OMV_FIRM_BASE=0x08040000 OMV_HSE_VALUE=25000000 DFU_DEVICE=0x2341:0x035b diff --git a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk index 4b74303b1..953017422 100755 --- a/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk +++ b/src/omv/boards/ARDUINO_PORTENTA_H7/omv_boardconfig.mk @@ -2,10 +2,6 @@ MCU=STM32H747xx CPU=cortex-m7 FPU=fpv5-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/h7 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_H7 OMV_FIRM_BASE=0x08040000 OMV_HSE_VALUE=25000000 DFU_DEVICE=0x2341:0x035b diff --git a/src/omv/boards/OPENMV1/omv_boardconfig.mk b/src/omv/boards/OPENMV1/omv_boardconfig.mk index 07f295631..2e0584197 100755 --- a/src/omv/boards/OPENMV1/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV1/omv_boardconfig.mk @@ -2,16 +2,13 @@ MCU=STM32F407xx CPU=cortex-m4 FPU=fpv4-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/f4 -HAL_INC='' -CFLAGS_MCU=MCU_SERIES_F4 -OMV_BOARD_CFLAGS=-DUSE_USB_FS OMV_BOOT_BASE=0x08000000 OMV_FIRM_BASE=0x08010000 OMV_HSE_VALUE=12000000 DFU_DEVICE=0x0483:0xdf11 OMV_ENABLE_BL=1 OMV_ENABLE_UVC=1 +OMV_BOARD_CFLAGS=-DUSE_USB_FS MICROPY_PY_CSI = 1 MICROPY_PY_WINC1500 = 1 $(error "This camera is no longer supported :O Have fun hacking the code $(BRACKET)") diff --git a/src/omv/boards/OPENMV2/omv_boardconfig.mk b/src/omv/boards/OPENMV2/omv_boardconfig.mk index b9390083d..46593a113 100755 --- a/src/omv/boards/OPENMV2/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV2/omv_boardconfig.mk @@ -1,13 +1,7 @@ MCU=STM32F427xx -MCU_SERIES=STM32F4xx CPU=cortex-m4 FPU=fpv4-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/f4 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_F4 -OMV_BOARD_CFLAGS=-DCFG_TUSB_MCU=OPT_MCU_STM32F4 OMV_BOOT_BASE=0x08000000 OMV_FIRM_BASE=0x08010000 OMV_HSE_VALUE=12000000 diff --git a/src/omv/boards/OPENMV3/omv_boardconfig.mk b/src/omv/boards/OPENMV3/omv_boardconfig.mk index 6dbcacc76..c63c84ed0 100755 --- a/src/omv/boards/OPENMV3/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV3/omv_boardconfig.mk @@ -1,13 +1,7 @@ MCU=STM32F765xx -MCU_SERIES=STM32F7xx CPU=cortex-m7 FPU=fpv5-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/f7 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_F7 -OMV_BOARD_CFLAGS=-DCFG_TUSB_MCU=OPT_MCU_STM32F7 OMV_BOOT_BASE=0x08000000 OMV_FIRM_BASE=0x08020000 OMV_HSE_VALUE=12000000 diff --git a/src/omv/boards/OPENMV4/omv_boardconfig.mk b/src/omv/boards/OPENMV4/omv_boardconfig.mk index ecbb782b1..2064b6e2e 100755 --- a/src/omv/boards/OPENMV4/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4/omv_boardconfig.mk @@ -1,13 +1,7 @@ MCU=STM32H743xx -MCU_SERIES=STM32H7xx CPU=cortex-m7 FPU=fpv5-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/h7 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_H7 -OMV_BOARD_CFLAGS=-DCFG_TUSB_MCU=OPT_MCU_STM32H7 OMV_BOOT_BASE=0x08000000 OMV_FIRM_BASE=0x08040000 OMV_HSE_VALUE=12000000 diff --git a/src/omv/boards/OPENMV4P/omv_boardconfig.mk b/src/omv/boards/OPENMV4P/omv_boardconfig.mk index ecbb782b1..2064b6e2e 100755 --- a/src/omv/boards/OPENMV4P/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV4P/omv_boardconfig.mk @@ -1,13 +1,7 @@ MCU=STM32H743xx -MCU_SERIES=STM32H7xx CPU=cortex-m7 FPU=fpv5-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/h7 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_H7 -OMV_BOARD_CFLAGS=-DCFG_TUSB_MCU=OPT_MCU_STM32H7 OMV_BOOT_BASE=0x08000000 OMV_FIRM_BASE=0x08040000 OMV_HSE_VALUE=12000000 diff --git a/src/omv/boards/OPENMVPT/omv_boardconfig.mk b/src/omv/boards/OPENMVPT/omv_boardconfig.mk index 6747fc33b..21aaffe8a 100755 --- a/src/omv/boards/OPENMVPT/omv_boardconfig.mk +++ b/src/omv/boards/OPENMVPT/omv_boardconfig.mk @@ -1,13 +1,7 @@ MCU=STM32H743xx -MCU_SERIES=STM32H7xx CPU=cortex-m7 FPU=fpv5-sp-d16 PORT=stm32 -HAL_DIR=hal/stm32/h7 -HAL_INC='' -CMSIS_MCU_H='' -CFLAGS_MCU=MCU_SERIES_H7 -OMV_BOARD_CFLAGS=-DCFG_TUSB_MCU=OPT_MCU_STM32H7 OMV_BOOT_BASE=0x08000000 OMV_FIRM_BASE=0x08040000 OMV_HSE_VALUE=12000000 diff --git a/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk b/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk index 67c6bc779..23a4795d9 100755 --- a/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV_RT1060/omv_boardconfig.mk @@ -1,11 +1,8 @@ -MCU_SERIES = MIMXRT1062 -MCU_VARIANT = MIMXRT1062DVJ6A +MCU=MIMXRT1062DVJ6A CPU=cortex-m7 FPU=fpv5-sp-d16 FABI=hard PORT=mimxrt -HAL_DIR=hal/mimxrt/MIMXRT1062 -CMSIS_MCU_H='' OMV_BOARD_CFLAGS=-DBOARD_FLASH_SIZE=0x800000 OMV_FIRM_BASE=0x60000000 OMV_HSE_VALUE=12000000 diff --git a/src/omv/boards/RPI_PICO/omv_boardconfig.mk b/src/omv/boards/RPI_PICO/omv_boardconfig.mk new file mode 100755 index 000000000..7d62f97c9 --- /dev/null +++ b/src/omv/boards/RPI_PICO/omv_boardconfig.mk @@ -0,0 +1 @@ +PORT=rp2