From ce9480f8546d891190236b2438810c598d23d17b Mon Sep 17 00:00:00 2001 From: andreika-git Date: Sun, 11 Feb 2024 23:03:59 +0200 Subject: [PATCH] remove SHORT_BOARD_NAME def from .mk https://github.com/rusefi/rusefi/issues/5931 --- firmware/config/boards/at_start_f435/board.mk | 2 -- firmware/config/boards/atlas/board.mk | 1 - firmware/config/boards/cypress/config.mk | 1 - firmware/config/boards/f407-discovery/board.mk | 1 - firmware/config/boards/f429-208/board.mk | 3 --- firmware/config/boards/f429-discovery/board.mk | 2 -- firmware/config/boards/f469-discovery/board.mk | 2 +- firmware/config/boards/frankenso_na6/board.mk | 1 - firmware/config/boards/hellen/alphax-2chan/board.mk | 2 -- firmware/config/boards/hellen/alphax-4chan/board.mk | 2 -- firmware/config/boards/hellen/alphax-8chan-revA/board.mk | 1 - firmware/config/boards/hellen/alphax-8chan/board.mk | 2 -- firmware/config/boards/hellen/hellen-112-17/board.mk | 2 -- firmware/config/boards/hellen/hellen-gm-e67/board.mk | 2 -- firmware/config/boards/hellen/hellen-honda-k/board.mk | 2 -- firmware/config/boards/hellen/hellen-nb1/board.mk | 1 - firmware/config/boards/hellen/hellen121nissan/board.mk | 2 -- firmware/config/boards/hellen/hellen121vag/board.mk | 2 -- firmware/config/boards/hellen/hellen128/board.mk | 2 -- firmware/config/boards/hellen/hellen154hyundai/board.mk | 2 -- firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk | 2 -- firmware/config/boards/hellen/hellen72/board.mk | 2 -- firmware/config/boards/hellen/hellen81/board.mk | 2 -- firmware/config/boards/hellen/hellen88bmw/board.mk | 2 -- firmware/config/boards/hellen/hellenNA8_96/board.mk | 1 - firmware/config/boards/hellen/small-can-board/board.mk | 2 -- firmware/config/boards/hellen/uaefi/board.mk | 2 -- firmware/config/boards/kinetis/board.mk | 1 - firmware/config/boards/m74_9/board.mk | 2 -- firmware/config/boards/microrusefi/board.mk | 2 -- firmware/config/boards/nucleo_f413/board.mk | 1 - firmware/config/boards/nucleo_f429/board.mk | 1 - firmware/config/boards/nucleo_f767/board.mk | 1 - firmware/config/boards/nucleo_h743/board.mk | 1 - firmware/config/boards/prometheus/prometheus-common-board.mk | 2 -- firmware/config/boards/proteus/board.mk | 3 --- firmware/config/boards/s105/board.mk | 1 - firmware/config/boards/subaru_eg33/board.mk | 2 -- firmware/config/boards/tdg-pdm8/board.mk | 1 - firmware/config/boards/test-build-guards/board.mk | 1 - 40 files changed, 1 insertion(+), 66 deletions(-) diff --git a/firmware/config/boards/at_start_f435/board.mk b/firmware/config/boards/at_start_f435/board.mk index ad949242e3..488f2e1410 100644 --- a/firmware/config/boards/at_start_f435/board.mk +++ b/firmware/config/boards/at_start_f435/board.mk @@ -29,6 +29,4 @@ DDEFS += -DFIRMWARE_ID=\"at_start_f435\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_AT_START_F435 -SHORT_BOARD_NAME=at_start_f435 - DDEFS += -DEFI_BACKUP_SRAM=FALSE diff --git a/firmware/config/boards/atlas/board.mk b/firmware/config/boards/atlas/board.mk index eb9d2a83be..c5f61cfb44 100644 --- a/firmware/config/boards/atlas/board.mk +++ b/firmware/config/boards/atlas/board.mk @@ -18,4 +18,3 @@ DDEFS += -DEFI_TCU=TRUE DDEFS += -DEFI_ETHERNET=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ATLAS -SHORT_BOARD_NAME = atlas diff --git a/firmware/config/boards/cypress/config.mk b/firmware/config/boards/cypress/config.mk index 2d091a57ab..0f4ec8e974 100644 --- a/firmware/config/boards/cypress/config.mk +++ b/firmware/config/boards/cypress/config.mk @@ -11,7 +11,6 @@ GENERATED_ENUMS_DIR = $(BOARD_DIR)/config/controllers/algo EXTRA_PARAMS += -DFIRMWARE_ID=\"cypress\" DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CYPRESS -SHORT_BOARD_NAME=cypress # used by USE_SMART_BUILD CONFDIR = $(BOARD_DIR) diff --git a/firmware/config/boards/f407-discovery/board.mk b/firmware/config/boards/f407-discovery/board.mk index ebb975f22f..a6d574610a 100644 --- a/firmware/config/boards/f407-discovery/board.mk +++ b/firmware/config/boards/f407-discovery/board.mk @@ -42,7 +42,6 @@ DDEFS += -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DEFI_SENT_SUPPORT=TRUE -SHORT_BOARD_NAME = f407-discovery DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F407_DISCOVERY # TS_SECONDARY_UxART_PORT diff --git a/firmware/config/boards/f429-208/board.mk b/firmware/config/boards/f429-208/board.mk index a734f7dc96..6dc55290b6 100644 --- a/firmware/config/boards/f429-208/board.mk +++ b/firmware/config/boards/f429-208/board.mk @@ -18,8 +18,5 @@ DDEFS += -DHAL_USE_SDRAM=TRUE DDEFS += -DHAL_USE_FSMC=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HABA208 -# see signature_haba208.h -SHORT_BOARD_NAME=haba208 - # Shared variables ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/f429-discovery/board.mk b/firmware/config/boards/f429-discovery/board.mk index 94216bd4b0..617280839e 100644 --- a/firmware/config/boards/f429-discovery/board.mk +++ b/firmware/config/boards/f429-discovery/board.mk @@ -20,7 +20,5 @@ DDEFS += -DHAL_USE_SDRAM=TRUE DDEFS += -DHAL_USE_FSMC=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F429_DISCOVERY -SHORT_BOARD_NAME = f429-discovery - # Shared variables ALLINC += $(BOARDINC) diff --git a/firmware/config/boards/f469-discovery/board.mk b/firmware/config/boards/f469-discovery/board.mk index a212084761..6fa3386a6d 100644 --- a/firmware/config/boards/f469-discovery/board.mk +++ b/firmware/config/boards/f469-discovery/board.mk @@ -1 +1 @@ -SHORT_BOARD_NAME = f469-discovery +# empty? diff --git a/firmware/config/boards/frankenso_na6/board.mk b/firmware/config/boards/frankenso_na6/board.mk index f4473c4140..47038eea25 100644 --- a/firmware/config/boards/frankenso_na6/board.mk +++ b/firmware/config/boards/frankenso_na6/board.mk @@ -6,7 +6,6 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) endif DDEFS += -DFIRMWARE_ID=\"frankenso_na6\" -SHORT_BOARD_NAME=frankenso_na6 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_FRANKENSO_NA6 DDEFS += -DRAM_UNUSED_SIZE=200 diff --git a/firmware/config/boards/hellen/alphax-2chan/board.mk b/firmware/config/boards/hellen/alphax-2chan/board.mk index 7ae6900b5d..7efba0d661 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board.mk +++ b/firmware/config/boards/hellen/alphax-2chan/board.mk @@ -23,5 +23,3 @@ DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_2CHAN -SHORT_BOARD_NAME=alphax-2chan - diff --git a/firmware/config/boards/hellen/alphax-4chan/board.mk b/firmware/config/boards/hellen/alphax-4chan/board.mk index f050abc36e..3ab24a701b 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board.mk +++ b/firmware/config/boards/hellen/alphax-4chan/board.mk @@ -21,7 +21,6 @@ DDEFS += -DTRIGGER_SCOPE ifeq ($(PROJECT_CPU),ARCH_STM32F7) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN_F7 - SHORT_BOARD_NAME=alphax-4chan_f7 # TODO: why do I struggle to fit into flash? compare with Proteus #Linker options, flash size USE_OPT += -Wl,--defsym=FLASH_SIZE=768k @@ -30,7 +29,6 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F7) DDEFS += -DTS_PRIMARY_UxART_PORT=SD2 -DEFI_TS_PRIMARY_IS_SERIAL=TRUE -DSTM32_SERIAL_USE_USART2=TRUE -DSTM32_UART_USE_USART2=FALSE else ifeq ($(PROJECT_CPU),ARCH_STM32F4) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN - SHORT_BOARD_NAME=alphax-4chan DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) else $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)]) diff --git a/firmware/config/boards/hellen/alphax-8chan-revA/board.mk b/firmware/config/boards/hellen/alphax-8chan-revA/board.mk index 421b606641..4faa0e33d5 100644 --- a/firmware/config/boards/hellen/alphax-8chan-revA/board.mk +++ b/firmware/config/boards/hellen/alphax-8chan-revA/board.mk @@ -27,5 +27,4 @@ endif DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN -SHORT_BOARD_NAME=alphax-8chan DDEFS += -DHW_HELLEN_8CHAN=1 diff --git a/firmware/config/boards/hellen/alphax-8chan/board.mk b/firmware/config/boards/hellen/alphax-8chan/board.mk index a315274bbb..fa1b4f7412 100644 --- a/firmware/config/boards/hellen/alphax-8chan/board.mk +++ b/firmware/config/boards/hellen/alphax-8chan/board.mk @@ -14,13 +14,11 @@ LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=H176_MCU_MEGA_LED1 include $(BOARDS_DIR)/hellen/hellen-common176.mk ifeq ($(PROJECT_CPU),ARCH_STM32F7) - SHORT_BOARD_NAME=alphax-8chan_f7 # TODO: why do I struggle to fit into flash? compare with Proteus DDEFS += -DCH_DBG_ENABLE_ASSERTS=FALSE DDEFS += -DENABLE_PERF_TRACE=FALSE USE_OPT += -Wl,--defsym=FLASH_SIZE=768k else ifeq ($(PROJECT_CPU),ARCH_STM32F4) - SHORT_BOARD_NAME=alphax-8chan # This board has trigger scope hardware! DDEFS += -DTRIGGER_SCOPE # serial ports only on F4 diff --git a/firmware/config/boards/hellen/hellen-112-17/board.mk b/firmware/config/boards/hellen/hellen-112-17/board.mk index 7097e097f0..50f322d26c 100644 --- a/firmware/config/boards/hellen/hellen-112-17/board.mk +++ b/firmware/config/boards/hellen/hellen-112-17/board.mk @@ -15,8 +15,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DFIRMWARE_ID=\"hellen-112-17\" $(VAR_DEF_ENGINE_TYPE) #DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE -SHORT_BOARD_NAME=hellen-112-17 - DDEFS += -DHELLEN_BOARD_ID_DEBUG ONBOARD_MEMS_TYPE=LIS2DH12 diff --git a/firmware/config/boards/hellen/hellen-gm-e67/board.mk b/firmware/config/boards/hellen/hellen-gm-e67/board.mk index 74e1c23244..b39c9b32a9 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/board.mk +++ b/firmware/config/boards/hellen/hellen-gm-e67/board.mk @@ -13,5 +13,3 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_GM_E67 -SHORT_BOARD_NAME=hellen-gm-e67 - diff --git a/firmware/config/boards/hellen/hellen-honda-k/board.mk b/firmware/config/boards/hellen/hellen-honda-k/board.mk index 7595395b8b..5677ca80ed 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/board.mk +++ b/firmware/config/boards/hellen/hellen-honda-k/board.mk @@ -19,8 +19,6 @@ DDEFS += -DFIRMWARE_ID=\"hellen-honda-k\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_HONDA_K -SHORT_BOARD_NAME=hellen-honda-k - # May be it is LIS2DW12? # EFI_ONBOARD_MEMS_LIS2DW12 = yes # DDEFS += -DLIS2DW12_USE_SPI=TRUE -DLIS2DW12_SHARED_SPI=TRUE diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellen-nb1/board.mk index 3e851df626..ef7ed3a80a 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board.mk +++ b/firmware/config/boards/hellen/hellen-nb1/board.mk @@ -18,6 +18,5 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk # Enable serial pins on expansion header DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1 -SHORT_BOARD_NAME=hellen-nb1 DDEFS += -DHW_HELLEN_NB1=1 diff --git a/firmware/config/boards/hellen/hellen121nissan/board.mk b/firmware/config/boards/hellen/hellen121nissan/board.mk index d102c1dd22..51ae6b8e96 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board.mk +++ b/firmware/config/boards/hellen/hellen121nissan/board.mk @@ -17,7 +17,5 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DMAX_TPS_PPS_DISCREPANCY=10.0f DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121NISSAN -SHORT_BOARD_NAME = hellen121nissan - include $(BOARDS_DIR)/hellen/hellen-common144.mk DDEFS += -DHW_HELLEN_NISSAN=1 diff --git a/firmware/config/boards/hellen/hellen121vag/board.mk b/firmware/config/boards/hellen/hellen121vag/board.mk index 56f3057625..007afc66e9 100644 --- a/firmware/config/boards/hellen/hellen121vag/board.mk +++ b/firmware/config/boards/hellen/hellen121vag/board.mk @@ -20,8 +20,6 @@ endif DDEFS += -DEFI_LUA_LOOKUP=$(EFI_LUA_LOOKUP) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121VAG -SHORT_BOARD_NAME=hellen121vag - include $(BOARDS_DIR)/hellen/hellen-common176.mk DDEFS += -DHW_HELLEN_121_VAG=1 diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk index 066a6ba8db..4d5e327101 100644 --- a/firmware/config/boards/hellen/hellen128/board.mk +++ b/firmware/config/boards/hellen/hellen128/board.mk @@ -16,8 +16,6 @@ DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_128 -SHORT_BOARD_NAME = hellen128 - include $(BOARDS_DIR)/hellen/hellen-common176.mk DDEFS += -DHW_HELLEN_MERCEDES=1 diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk index 7fb7efa842..990694b95d 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk @@ -21,7 +21,5 @@ DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_154_HYUNDAI -SHORT_BOARD_NAME = hellen154hyundai - include $(BOARDS_DIR)/hellen/hellen-common144.mk DDEFS += -DHW_HELLEN_HYUNDAI=1 diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk index 198c30fd9e..0fe5b3fe8b 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk @@ -17,6 +17,4 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DDISABLE_PIN_STATE_VALIDATION=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA6 -SHORT_BOARD_NAME = hellenNA6 - include $(BOARDS_DIR)/hellen/hellen-common176.mk diff --git a/firmware/config/boards/hellen/hellen72/board.mk b/firmware/config/boards/hellen/hellen72/board.mk index ee06f9a557..616bb0511a 100644 --- a/firmware/config/boards/hellen/hellen72/board.mk +++ b/firmware/config/boards/hellen/hellen72/board.mk @@ -16,7 +16,5 @@ DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_72 -SHORT_BOARD_NAME = hellen72 - include $(BOARDS_DIR)/hellen/hellen-common176.mk DDEFS += -DHW_HELLEN_NB2=1 diff --git a/firmware/config/boards/hellen/hellen81/board.mk b/firmware/config/boards/hellen/hellen81/board.mk index 1eab3a8d54..f85a7bdfb5 100644 --- a/firmware/config/boards/hellen/hellen81/board.mk +++ b/firmware/config/boards/hellen/hellen81/board.mk @@ -24,6 +24,4 @@ DDEFS += -DSTM32_PWM_USE_TIM3=FALSE # DDEFS += -DADC_BUF_NUM_AVG=1 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_81 -SHORT_BOARD_NAME = hellen81 - include $(BOARDS_DIR)/hellen/hellen-common176.mk diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk index 8d4dc802b1..28723bfc2b 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board.mk +++ b/firmware/config/boards/hellen/hellen88bmw/board.mk @@ -14,6 +14,4 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_88_BMW -SHORT_BOARD_NAME = hellen88bmw - include $(BOARDS_DIR)/hellen/hellen-common144.mk diff --git a/firmware/config/boards/hellen/hellenNA8_96/board.mk b/firmware/config/boards/hellen/hellenNA8_96/board.mk index 5fe4f7ad5a..46ca0ebc38 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board.mk +++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk @@ -14,7 +14,6 @@ DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE include $(BOARDS_DIR)/hellen/hellen-common144.mk DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA8_96 -SHORT_BOARD_NAME=hellenNA8_96 # Enable serial pins on expansion header DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) diff --git a/firmware/config/boards/hellen/small-can-board/board.mk b/firmware/config/boards/hellen/small-can-board/board.mk index 1420f67a63..75d569942f 100644 --- a/firmware/config/boards/hellen/small-can-board/board.mk +++ b/firmware/config/boards/hellen/small-can-board/board.mk @@ -3,8 +3,6 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp DDEFS += -DFIRMWARE_ID=\"small-can-board\" DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SMALL_CAN_BOARD -SHORT_BOARD_NAME=small-can-board - #DDEFS += -DEFI_SENT_SUPPORT=TRUE DDEFS += -DPERSISTENT_LOCATION_VALUE=\"__attribute__\(\(section\(\\\".ram1\\\"\)\)\)\" diff --git a/firmware/config/boards/hellen/uaefi/board.mk b/firmware/config/boards/hellen/uaefi/board.mk index 92e5799fe8..2e6312007a 100644 --- a/firmware/config/boards/hellen/uaefi/board.mk +++ b/firmware/config/boards/hellen/uaefi/board.mk @@ -17,8 +17,6 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE # EGT chip DDEFS += -DEFI_MAX_31855=TRUE -SHORT_BOARD_NAME=uaefi - DDEFS += -DHELLEN_BOARD_ID_DEBUG DDEFS += -DHW_HELLEN_UAEFI=1 diff --git a/firmware/config/boards/kinetis/board.mk b/firmware/config/boards/kinetis/board.mk index 3539950927..c935a7c30e 100644 --- a/firmware/config/boards/kinetis/board.mk +++ b/firmware/config/boards/kinetis/board.mk @@ -15,7 +15,6 @@ LDSCRIPT = $(STARTUPLD_KINETIS)/MKE1xF512.ld CONFDIR = $(BOARD_DIR) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_KIN -SHORT_BOARD_NAME=kin DDEFS += -DCPU_MKE16F512VLH16 DDEFS += -DCPU_MKE16F512VLH16_cm4 DDEFS += -D__USE_CMSIS diff --git a/firmware/config/boards/m74_9/board.mk b/firmware/config/boards/m74_9/board.mk index 9f8d34224b..c45b795f0f 100644 --- a/firmware/config/boards/m74_9/board.mk +++ b/firmware/config/boards/m74_9/board.mk @@ -33,6 +33,4 @@ DDEFS += -DFIRMWARE_ID=\"m74_9\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_M74_9 -SHORT_BOARD_NAME=m74_9 - DDEFS += -DEFI_BACKUP_SRAM=FALSE diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index e2055d56ce..e6d8c4ba7c 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -48,10 +48,8 @@ DDEFS += -DHW_MICRO_RUSEFI=1 ifeq ($(PROJECT_CPU),ARCH_STM32F7) USE_OPT += -Wl,--defsym=FLASH_SIZE=768k DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7 - SHORT_BOARD_NAME=mre_f7 else ifeq ($(PROJECT_CPU),ARCH_STM32F4) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4 - SHORT_BOARD_NAME=mre_f4 DDEFS += -DRAM_UNUSED_SIZE=4000 else $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)]) diff --git a/firmware/config/boards/nucleo_f413/board.mk b/firmware/config/boards/nucleo_f413/board.mk index 0b15e42ae7..95cf97bb6e 100644 --- a/firmware/config/boards/nucleo_f413/board.mk +++ b/firmware/config/boards/nucleo_f413/board.mk @@ -1,4 +1,3 @@ -SHORT_BOARD_NAME=nucleo_f413 DDEFS += -DFIRMWARE_ID=\"nucleo_f413\" diff --git a/firmware/config/boards/nucleo_f429/board.mk b/firmware/config/boards/nucleo_f429/board.mk index 3aace2fbe8..3cbc121ed3 100644 --- a/firmware/config/boards/nucleo_f429/board.mk +++ b/firmware/config/boards/nucleo_f429/board.mk @@ -13,5 +13,4 @@ IS_STM32F429 = yes DDEFS += -DFIRMWARE_ID=\"nucleo_f429\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F429 -SHORT_BOARD_NAME=stm32f429_nucleo DDEFS += -DRAM_UNUSED_SIZE=10000 diff --git a/firmware/config/boards/nucleo_f767/board.mk b/firmware/config/boards/nucleo_f767/board.mk index 580c9135d7..8bb28401e4 100644 --- a/firmware/config/boards/nucleo_f767/board.mk +++ b/firmware/config/boards/nucleo_f767/board.mk @@ -17,4 +17,3 @@ DDEFS += -DEFI_ETHERNET=TRUE DDEFS += -DFIRMWARE_ID=\"nucleo_f767\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F767 -SHORT_BOARD_NAME=stm32f767_nucleo diff --git a/firmware/config/boards/nucleo_h743/board.mk b/firmware/config/boards/nucleo_h743/board.mk index d2a6fa00ee..3c47bf16fb 100644 --- a/firmware/config/boards/nucleo_h743/board.mk +++ b/firmware/config/boards/nucleo_h743/board.mk @@ -12,4 +12,3 @@ DDEFS += -DEFI_ETHERNET=TRUE DDEFS += -DFIRMWARE_ID=\"nucleo_h743\" DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_H743 -SHORT_BOARD_NAME=stm32h743_nucleo diff --git a/firmware/config/boards/prometheus/prometheus-common-board.mk b/firmware/config/boards/prometheus/prometheus-common-board.mk index 201bf26a70..c49b1ccea8 100644 --- a/firmware/config/boards/prometheus/prometheus-common-board.mk +++ b/firmware/config/boards/prometheus/prometheus-common-board.mk @@ -19,9 +19,7 @@ DDEFS += -DRAM_UNUSED_SIZE=4000 ifeq ($(PROMETHEUS_BOARD),405) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROMETHEUS_405 DDEFS += -DFIRMWARE_ID=\"prometeus405\" - SHORT_BOARD_NAME=prometheus_405 else DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROMETHEUS_469 DDEFS += -DFIRMWARE_ID=\"prometeus469\" - SHORT_BOARD_NAME=prometheus_469 endif diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 3d6fe02af2..c1b33b2ab3 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -35,7 +35,6 @@ DDEFS += -DHW_PROTEUS=1 ifeq ($(PROJECT_CPU),ARCH_STM32F7) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F7 - SHORT_BOARD_NAME=proteus_f7 ifeq ($(EFI_LUA_LOOKUP),) EFI_LUA_LOOKUP = FALSE @@ -48,10 +47,8 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F7) endif else ifeq ($(PROJECT_CPU),ARCH_STM32F4) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F4 - SHORT_BOARD_NAME=proteus_f4 else ifeq ($(PROJECT_CPU),ARCH_STM32H7) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_H7 - SHORT_BOARD_NAME=proteus_h7 else $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)]) endif diff --git a/firmware/config/boards/s105/board.mk b/firmware/config/boards/s105/board.mk index e5c795d65a..7b3787288d 100644 --- a/firmware/config/boards/s105/board.mk +++ b/firmware/config/boards/s105/board.mk @@ -5,7 +5,6 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp # This is S105 board DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_S105 -SHORT_BOARD_NAME=s105 # This board has no LSE and HSE oscillators DDEFS += -DSTM32_HSE_ENABLED=FALSE diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk index 27bea9fad0..dc86759b89 100644 --- a/firmware/config/boards/subaru_eg33/board.mk +++ b/firmware/config/boards/subaru_eg33/board.mk @@ -16,8 +16,6 @@ DDEFS += -DHW_SUBARU_EG33=1 DDEFS += -DFIRMWARE_ID=\"EG33\" DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SUBARU_EG33_F7 -SHORT_BOARD_NAME = subaru_eg33_f7 - # Override DEFAULT_ENGINE_TYPE DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::SUBARU_EG33 diff --git a/firmware/config/boards/tdg-pdm8/board.mk b/firmware/config/boards/tdg-pdm8/board.mk index 88a77b3a0c..b1a2dbe0fa 100644 --- a/firmware/config/boards/tdg-pdm8/board.mk +++ b/firmware/config/boards/tdg-pdm8/board.mk @@ -13,5 +13,4 @@ DDEFS += -DRAM_UNUSED_SIZE=20000 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TDG_PDM8 DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\" -SHORT_BOARD_NAME=tdg-pdm8 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS diff --git a/firmware/config/boards/test-build-guards/board.mk b/firmware/config/boards/test-build-guards/board.mk index e8c59f91a0..1e9de5c32e 100644 --- a/firmware/config/boards/test-build-guards/board.mk +++ b/firmware/config/boards/test-build-guards/board.mk @@ -2,7 +2,6 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp DDEFS += -DFIRMWARE_ID=\"t-b-g\" DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TBG -SHORT_BOARD_NAME=t-b-g DDEFS += -DHAL_USE_ADC=FALSE DDEFS += -DHAL_USE_GPT=FALSE