From cafddfed1793a62af588bc7512938d27a8aab28a Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 14 Dec 2016 13:55:53 +0200 Subject: [PATCH] Redefine CFLAGS MCU_SERIES in the top Makefile. * Make sure the MCU_SERIES is defined if MP config files are included outside MP build. --- src/Makefile | 6 +++--- src/omv/boards/OPENMV1/omv_boardconfig.mk | 1 + src/omv/boards/OPENMV2/omv_boardconfig.mk | 1 + src/omv/boards/OPENMV3/omv_boardconfig.mk | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index f035b113f..b415ebcda 100755 --- a/src/Makefile +++ b/src/Makefile @@ -67,9 +67,9 @@ endif # Compiler Flags include $(TOP_DIR)/$(OMV_DIR)/boards/$(TARGET)/omv_boardconfig.mk CFLAGS += -std=gnu99 -Wall -Werror -Warray-bounds -mthumb -nostartfiles -mabi=aapcs-linux -fdata-sections -ffunction-sections -CFLAGS += -D$(MCU) -D$(ARM_MATH) -fsingle-precision-constant -Wdouble-promotion -mcpu=$(CPU) -mtune=$(CPU) -mfpu=$(FPU) -mfloat-abi=hard -CFLAGS += -D__FPU_PRESENT=1 -D__VFP_FP__ -DUSE_USB_FS -DUSE_DEVICE_MODE -DUSE_USB_OTG_ID=0 -DHSE_VALUE=12000000 -D$(TARGET)\ - -DSTM32_HAL_H=$(HAL_INC) -DVECT_TAB_OFFSET=$(VECT_TAB_OFFSET) -DMAIN_APP_ADDR=$(MAIN_APP_ADDR) +CFLAGS += -D$(MCU) -D$(CFLAGS_MCU) -D$(ARM_MATH) -fsingle-precision-constant -Wdouble-promotion -mcpu=$(CPU) -mtune=$(CPU) -mfpu=$(FPU) -mfloat-abi=hard +CFLAGS += -D__FPU_PRESENT=1 -D__VFP_FP__ -DUSE_USB_FS -DUSE_DEVICE_MODE -DUSE_USB_OTG_ID=0 -DHSE_VALUE=12000000 -D$(TARGET) -DSTM32_HAL_H=$(HAL_INC) \ + -DVECT_TAB_OFFSET=$(VECT_TAB_OFFSET) -DMAIN_APP_ADDR=$(MAIN_APP_ADDR) CFLAGS += -I. -Iinclude CFLAGS += -I$(TOP_DIR)/$(BOOT_DIR)/include/ diff --git a/src/omv/boards/OPENMV1/omv_boardconfig.mk b/src/omv/boards/OPENMV1/omv_boardconfig.mk index ac32f8bd0..7dfc1aa85 100755 --- a/src/omv/boards/OPENMV1/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV1/omv_boardconfig.mk @@ -4,6 +4,7 @@ FPU=fpv4-sp-d16 STHAL_DIR=sthal/f4 ARM_MATH=ARM_MATH_CM4 HAL_INC='' +CFLAGS_MCU=MCU_SERIES_F4 STARTUP=startup_stm32f407xx VECT_TAB_OFFSET=0x10000 MAIN_APP_ADDR=0x08010000 diff --git a/src/omv/boards/OPENMV2/omv_boardconfig.mk b/src/omv/boards/OPENMV2/omv_boardconfig.mk index 7ce9b0697..76f893e27 100755 --- a/src/omv/boards/OPENMV2/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV2/omv_boardconfig.mk @@ -4,6 +4,7 @@ FPU=fpv4-sp-d16 STHAL_DIR=sthal/f4 ARM_MATH=ARM_MATH_CM4 HAL_INC='' +CFLAGS_MCU=MCU_SERIES_F4 STARTUP=startup_stm32f427xx VECT_TAB_OFFSET=0x10000 MAIN_APP_ADDR=0x08010000 diff --git a/src/omv/boards/OPENMV3/omv_boardconfig.mk b/src/omv/boards/OPENMV3/omv_boardconfig.mk index 08f49f4fb..7336ae779 100755 --- a/src/omv/boards/OPENMV3/omv_boardconfig.mk +++ b/src/omv/boards/OPENMV3/omv_boardconfig.mk @@ -4,6 +4,7 @@ FPU=fpv5-sp-d16 STHAL_DIR=sthal/f7 ARM_MATH=ARM_MATH_CM7 HAL_INC='' +CFLAGS_MCU=MCU_SERIES_F7 STARTUP=startup_stm32f765xx VECT_TAB_OFFSET=0x20000 MAIN_APP_ADDR=0x08020000