From 729e107474621a318744fb8a5d9b37aaa8bb77fd Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 1 Feb 2022 15:18:16 -0800 Subject: [PATCH] we have other places to set these MCU values (#3875) * we have other places to set these values * missing parts Co-authored-by: rusefillc --- firmware/Makefile | 4 ---- firmware/config/boards/subaru_eg33/make.sh | 1 - firmware/hw_layer/ports/cypress/hw_ports.mk | 2 ++ firmware/hw_layer/ports/kinetis/hw_ports.mk | 2 ++ 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index e9357cb867..e66c485dfb 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -297,10 +297,6 @@ INCDIR = \ # Compiler settings # -ifeq ($(MCU),) - MCU = cortex-m4 -endif - ifeq ($(CROSS_COMPILE),) TRGT = arm-none-eabi- else diff --git a/firmware/config/boards/subaru_eg33/make.sh b/firmware/config/boards/subaru_eg33/make.sh index 7167e0aff2..46c24beb20 100755 --- a/firmware/config/boards/subaru_eg33/make.sh +++ b/firmware/config/boards/subaru_eg33/make.sh @@ -1,7 +1,6 @@ #!/bin/bash export PROJECT_BOARD=subaru_eg33 export PROJECT_CPU=ARCH_STM32F7 -export MCU=cortex-m7 export EXTRA_PARAMS="-DSHORT_BOARD_NAME=subaru_eg33_f7 -DDUMMY -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE" export DEFAULT_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS" #echo $EXTRA_PARAMS diff --git a/firmware/hw_layer/ports/cypress/hw_ports.mk b/firmware/hw_layer/ports/cypress/hw_ports.mk index 3da336035f..da5e9502b4 100644 --- a/firmware/hw_layer/ports/cypress/hw_ports.mk +++ b/firmware/hw_layer/ports/cypress/hw_ports.mk @@ -14,3 +14,5 @@ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/cypress/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/microsecond_timer/microsecond_timer_gpt.cpp \ HW_INC += $(PROJECT_DIR)/hw_layer/ports/cypress/serial_over_usb + +MCU = cortex-m4 diff --git a/firmware/hw_layer/ports/kinetis/hw_ports.mk b/firmware/hw_layer/ports/kinetis/hw_ports.mk index 1c8a672eab..1f4a9d8463 100644 --- a/firmware/hw_layer/ports/kinetis/hw_ports.mk +++ b/firmware/hw_layer/ports/kinetis/hw_ports.mk @@ -12,3 +12,5 @@ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/kinetis/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/kinetis/kinetis_common.cpp \ $(PROJECT_DIR)/hw_layer/trigger_input_comp.cpp \ $(PROJECT_DIR)/hw_layer/microsecond_timer/microsecond_timer_gpt.cpp \ + +MCU = cortex-m4