From e2a9acac233c31a2e103abc36b0a0d246d0ae866 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 4 Jan 2022 20:03:41 -0500 Subject: [PATCH] reducing copy-pasta - would this work? --- firmware/config/boards/f429-discovery/board.mk | 2 ++ .../boards/f429-discovery/board_configuration.cpp | 10 ++++++++++ firmware/config/boards/hellen/cypress/board.mk | 5 ----- firmware/config/boards/hellen/hellen-nb1/board.mk | 2 -- firmware/config/boards/hellen/hellen128/board.mk | 2 -- .../config/boards/hellen/hellen154hyundai/board.mk | 2 -- .../config/boards/hellen/hellen64_miataNA6_94/board.mk | 3 --- firmware/config/boards/hellen/hellen72/board.mk | 3 --- firmware/config/boards/hellen/hellen81/board.mk | 3 --- firmware/config/boards/hellen/hellen88bmw/board.mk | 3 --- firmware/config/boards/hellen/hellenNA8_96/board.mk | 2 -- firmware/config/boards/nucleo_f767/board.mk | 2 -- firmware/config/boards/nucleo_h743/board.mk | 2 -- firmware/config/boards/prometheus/prometheus-common.mk | 3 --- firmware/config/boards/proteus/board.mk | 3 --- firmware/config/boards/skeleton/board.mk | 3 --- firmware/config/boards/st_stm32f4/board.mk | 3 --- firmware/config/boards/subaru_eg33/board.mk | 3 --- 18 files changed, 12 insertions(+), 44 deletions(-) create mode 100644 firmware/config/boards/f429-discovery/board_configuration.cpp diff --git a/firmware/config/boards/f429-discovery/board.mk b/firmware/config/boards/f429-discovery/board.mk index ed3f3b265c..09acd3ee6d 100644 --- a/firmware/config/boards/f429-discovery/board.mk +++ b/firmware/config/boards/f429-discovery/board.mk @@ -1,3 +1,5 @@ BOARD_DIR = $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD) +BOARDCPPSRC = $(BOARDS_DIR)/f429-discovery/board_configuration.cpp + BOARDINC = $(BOARD_DIR) diff --git a/firmware/config/boards/f429-discovery/board_configuration.cpp b/firmware/config/boards/f429-discovery/board_configuration.cpp new file mode 100644 index 0000000000..079d8be00b --- /dev/null +++ b/firmware/config/boards/f429-discovery/board_configuration.cpp @@ -0,0 +1,10 @@ +#include "pch.h" + +void setPinConfigurationOverrides(void) { +} + +void setSerialConfigurationOverrides(void) { +} + +void setSdCardConfigurationOverrides(void) { +} diff --git a/firmware/config/boards/hellen/cypress/board.mk b/firmware/config/boards/hellen/cypress/board.mk index 394c9939a6..9922cfc8d2 100644 --- a/firmware/config/boards/hellen/cypress/board.mk +++ b/firmware/config/boards/hellen/cypress/board.mk @@ -22,8 +22,3 @@ BOARDCPPSRC += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS) # Define linker script file here LDSCRIPT= $(STARTUPLD_CYPRESS)/cypress_S6E2CxAH.ld -#PLATFORMSRC += $(PLATFORMSRC_CONTRIB) -#PLATFORMINC += $(PLATFORMINC_CONTRIB) - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellen-nb1/board.mk index f41499180d..dce7a755aa 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board.mk +++ b/firmware/config/boards/hellen/hellen-nb1/board.mk @@ -36,5 +36,3 @@ DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=GPIOD_6 -DEFI_CONSOLE_RX_BRAIN_PIN=GPIOD_5 - # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk index bd80f6314d..b180f2f582 100644 --- a/firmware/config/boards/hellen/hellen128/board.mk +++ b/firmware/config/boards/hellen/hellen128/board.mk @@ -34,5 +34,3 @@ DDEFS += -DEFI_LOGIC_ANALYZER=FALSE # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk index 0c1f8be81b..fa0f3fef4f 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk @@ -34,5 +34,3 @@ DDEFS += -DEFI_LOGIC_ANALYZER=FALSE # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk index e7654f734d..df71b6e03c 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk @@ -33,6 +33,3 @@ DDEFS += -DEFI_LOGIC_ANALYZER=FALSE # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellen72/board.mk b/firmware/config/boards/hellen/hellen72/board.mk index 20a1c0dbe2..d83e197a94 100644 --- a/firmware/config/boards/hellen/hellen72/board.mk +++ b/firmware/config/boards/hellen/hellen72/board.mk @@ -33,6 +33,3 @@ DDEFS += -DEFI_LOGIC_ANALYZER=FALSE # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellen81/board.mk b/firmware/config/boards/hellen/hellen81/board.mk index 3f9b5b8871..53c01f130e 100644 --- a/firmware/config/boards/hellen/hellen81/board.mk +++ b/firmware/config/boards/hellen/hellen81/board.mk @@ -49,6 +49,3 @@ DDEFS += -DEFI_OVERRIDE_FAST_ADC_FOR_STM32H7=TRUE -DADC_FAST_DEVICE=ADCD1 -DEFI_ # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk index 3ccfb5af03..59f73ce517 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board.mk +++ b/firmware/config/boards/hellen/hellen88bmw/board.mk @@ -33,6 +33,3 @@ DDEFS += -DEFI_LOGIC_ANALYZER=FALSE # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/hellen/hellenNA8_96/board.mk b/firmware/config/boards/hellen/hellenNA8_96/board.mk index 30824c7e11..6cc08ac1c1 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board.mk +++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk @@ -36,5 +36,3 @@ DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=GPIOD_6 -DEFI_CONSOLE_RX_BRAIN_PIN=GPIOD_5 - # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/nucleo_f767/board.mk b/firmware/config/boards/nucleo_f767/board.mk index 2c3af55511..65366b0b09 100644 --- a/firmware/config/boards/nucleo_f767/board.mk +++ b/firmware/config/boards/nucleo_f767/board.mk @@ -4,5 +4,3 @@ BOARDCPPSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp # Override DEFAULT_ENGINE_TYPE DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DSTM32F767xx -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/nucleo_h743/board.mk b/firmware/config/boards/nucleo_h743/board.mk index ef7d15438f..43bd250c57 100644 --- a/firmware/config/boards/nucleo_h743/board.mk +++ b/firmware/config/boards/nucleo_h743/board.mk @@ -9,5 +9,3 @@ DDEFS = -DTS_NO_PRIMARY=0 \ # Shared variables ALLCPPSRC += $(PROJECT_DIR)/config/boards/nucleo_h743/board_configuration.cpp -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/prometheus/prometheus-common.mk b/firmware/config/boards/prometheus/prometheus-common.mk index 9d043c2bbf..dadbcadad4 100644 --- a/firmware/config/boards/prometheus/prometheus-common.mk +++ b/firmware/config/boards/prometheus/prometheus-common.mk @@ -26,6 +26,3 @@ else # Override DEFAULT_ENGINE_TYPE DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DFIRMWARE_ID=\"prometeus469\" endif - -# Shared variables -ALLINC += $(BOARDINC) \ No newline at end of file diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 8efbbface7..9ad9eb28bd 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -45,6 +45,3 @@ DDEFS += -DHW_PROTEUS=1 ifeq ($(PROTEUS_LEGACY),TRUE) DDEFS += -DUSE_ADC3_VBATT_HACK endif - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/skeleton/board.mk b/firmware/config/boards/skeleton/board.mk index 39825d3354..c6d1b85efa 100644 --- a/firmware/config/boards/skeleton/board.mk +++ b/firmware/config/boards/skeleton/board.mk @@ -15,6 +15,3 @@ endif # Add them all together DDEFS += -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"skeleton\" $(DEFAULT_ENGINE_TYPE) - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/st_stm32f4/board.mk b/firmware/config/boards/st_stm32f4/board.mk index d65ba0d874..eea3ab1fcf 100644 --- a/firmware/config/boards/st_stm32f4/board.mk +++ b/firmware/config/boards/st_stm32f4/board.mk @@ -6,6 +6,3 @@ DDEFS += -DSTM32F407xx # We are running on Frankenso hardware! DDEFS += -DHW_FRANKENSO=1 - -# Shared variables -ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk index 99519cabb1..d0e7cf2ffa 100644 --- a/firmware/config/boards/subaru_eg33/board.mk +++ b/firmware/config/boards/subaru_eg33/board.mk @@ -31,8 +31,5 @@ DDEFS += -DEFI_LOGIC_ANALYZER=FALSE DDEFS += -DHAL_USE_UART=FALSE DDEFS += -DUART_USE_WAIT=FALSE -# Shared variables -ALLINC += $(BOARDINC) - #Serial flash support include $(PROJECT_DIR)/hw_layer/drivers/flash/sst26f_jedec.mk