From fa894d55a3bae238bce05aa2ae639a07a1f0e642 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 17 Feb 2021 12:25:57 -0800 Subject: [PATCH] set MCU properly (#2371) --- firmware/Makefile | 4 +++- firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk | 1 + firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk | 1 + firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/firmware/Makefile b/firmware/Makefile index f793c99b5f..d8a03f55b2 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -307,7 +307,9 @@ INCDIR = $(ALLINC) \ # Compiler settings # -MCU = cortex-m4 +ifeq ($(MCU),) + MCU = cortex-m4 +endif ifeq ($(CROSS_COMPILE),) TRGT = arm-none-eabi- diff --git a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk index fceb0f0c7e..b7eb258643 100644 --- a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk @@ -7,6 +7,7 @@ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_adc_v2.cpp \ DDEFS += -DSTM32F407xx +MCU = cortex-m4 LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/STM32F405xG.ld ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c CONFDIR = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/cfg diff --git a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk index e5bb8d1515..ee0b793150 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk @@ -7,6 +7,7 @@ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_adc_v2.cpp \ DDEFS += -DSTM32F767xx +MCU = cortex-m7 LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/STM32F76xxI.ld ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c CONFDIR = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/cfg diff --git a/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk index 561c801a9f..7d3cf3edd6 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk @@ -6,6 +6,7 @@ HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/stm32h7xx_hal_flash. HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/mpu_util.cpp DDEFS += -DSTM32H743xx +MCU = cortex-m7 LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/STM32H743xI.ld ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c CONFDIR = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/cfg