From c8ba68aa75db86bcd103b20dc3d08bc94e24c789 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Tue, 7 Nov 2023 15:47:24 -0500
Subject: [PATCH] one variable per line is usually better

---
 firmware/config/boards/at_start_f435/board.mk               | 4 +++-
 firmware/config/boards/atlas/board.mk                       | 3 ++-
 firmware/config/boards/f429-208/board.mk                    | 3 ++-
 firmware/config/boards/f429-discovery/board.mk              | 3 ++-
 firmware/config/boards/hellen/alphax-2chan/board.mk         | 4 +++-
 firmware/config/boards/hellen/alphax-4chan/board.mk         | 6 ++++--
 firmware/config/boards/hellen/alphax-8chan-revA/board.mk    | 4 +++-
 firmware/config/boards/hellen/alphax-8chan/board.mk         | 3 ++-
 firmware/config/boards/hellen/hellen-gm-e67/board.mk        | 3 ++-
 firmware/config/boards/hellen/hellen-honda-k/board.mk       | 3 ++-
 firmware/config/boards/hellen/hellen-nb1/board.mk           | 4 ++--
 firmware/config/boards/hellen/hellen121nissan/board.mk      | 3 ++-
 firmware/config/boards/hellen/hellen121vag/board.mk         | 3 ++-
 firmware/config/boards/hellen/hellen128/board.mk            | 3 ++-
 firmware/config/boards/hellen/hellen154hyundai/board.mk     | 3 ++-
 firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk | 3 ++-
 firmware/config/boards/hellen/hellen72/board.mk             | 3 ++-
 firmware/config/boards/hellen/hellen81/board.mk             | 4 ++--
 firmware/config/boards/hellen/hellen88bmw/board.mk          | 3 ++-
 firmware/config/boards/hellen/hellenNA8_96/board.mk         | 4 ++--
 firmware/config/boards/hellen/small-can-board/board.mk      | 4 +++-
 firmware/config/boards/kinetis/board.mk                     | 3 ++-
 firmware/config/boards/m74_9/board.mk                       | 5 ++++-
 firmware/config/boards/microrusefi/board.mk                 | 6 ++++--
 24 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/firmware/config/boards/at_start_f435/board.mk b/firmware/config/boards/at_start_f435/board.mk
index 13364b1c98..e7b56b1dec 100644
--- a/firmware/config/boards/at_start_f435/board.mk
+++ b/firmware/config/boards/at_start_f435/board.mk
@@ -27,6 +27,8 @@ DDEFS += -DEFI_FLASH_WRITE_THREAD=TRUE
 
 DDEFS += -DFIRMWARE_ID=\"at_start_f435\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
-DDEFS += -DSHORT_BOARD_NAME=at_start_f435 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_AT_START_F435
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_AT_START_F435
+
+DDEFS += -DSHORT_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 7fd3295659..2a122c8de7 100644
--- a/firmware/config/boards/atlas/board.mk
+++ b/firmware/config/boards/atlas/board.mk
@@ -15,5 +15,6 @@ DDEFS += -DHW_ATLAS=1
 LWIP = yes
 ALLOW_SHADOW = yes
 DDEFS += -DEFI_ETHERNET=TRUE
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ATLAS
 
-DDEFS += -DSHORT_BOARD_NAME=atlas -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ATLAS
+DDEFS += -DSHORT_BOARD_NAME=atlas
diff --git a/firmware/config/boards/f429-208/board.mk b/firmware/config/boards/f429-208/board.mk
index 145881177f..c0361ce377 100644
--- a/firmware/config/boards/f429-208/board.mk
+++ b/firmware/config/boards/f429-208/board.mk
@@ -16,9 +16,10 @@ DDEFS += -DSTM32_FSMC_USE_FSMC1=TRUE -DSTM32_SDRAM_USE_SDRAM2=TRUE
 
 DDEFS += -DHAL_USE_SDRAM=TRUE
 DDEFS += -DHAL_USE_FSMC=TRUE
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HABA208
 
 # see signature_haba208.h
-DDEFS += -DSHORT_BOARD_NAME=haba208 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HABA208
+DDEFS += -DSHORT_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 6b1a40042f..9a14e124cd 100644
--- a/firmware/config/boards/f429-discovery/board.mk
+++ b/firmware/config/boards/f429-discovery/board.mk
@@ -18,8 +18,9 @@ DDEFS += -DSTM32_USB_USE_OTG1=FALSE
 DDEFS += -DSTM32_USB_USE_OTG2=TRUE
 DDEFS += -DHAL_USE_SDRAM=TRUE
 DDEFS += -DHAL_USE_FSMC=TRUE
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F429_DISCOVERY
 
-DDEFS += -DSHORT_BOARD_NAME=f429-discovery -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F429_DISCOVERY
+DDEFS += -DSHORT_BOARD_NAME=f429-discovery
 
 # Shared variables
 ALLINC += $(BOARDINC)
diff --git a/firmware/config/boards/hellen/alphax-2chan/board.mk b/firmware/config/boards/hellen/alphax-2chan/board.mk
index bd125f7add..ebd69ce6cc 100644
--- a/firmware/config/boards/hellen/alphax-2chan/board.mk
+++ b/firmware/config/boards/hellen/alphax-2chan/board.mk
@@ -18,5 +18,7 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
 
 DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
 
-DDEFS += -DSHORT_BOARD_NAME=alphax-2chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_2CHAN
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_2CHAN
+
+DDEFS += -DSHORT_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 ff77bf2694..62a0a52749 100644
--- a/firmware/config/boards/hellen/alphax-4chan/board.mk
+++ b/firmware/config/boards/hellen/alphax-4chan/board.mk
@@ -22,7 +22,8 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
 DDEFS += -DTRIGGER_SCOPE
 
 ifeq ($(PROJECT_CPU),ARCH_STM32F7)
-	DDEFS += -DSHORT_BOARD_NAME=alphax-4chan_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN_F7
+	DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN_F7
+	DDEFS += -DSHORT_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 +31,8 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F7)
     DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::D6 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::D5
     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 += -DSHORT_BOARD_NAME=alphax-4chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN
+	DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN
+	DDEFS += -DSHORT_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 2c30864464..f3d2d166be 100644
--- a/firmware/config/boards/hellen/alphax-8chan-revA/board.mk
+++ b/firmware/config/boards/hellen/alphax-8chan-revA/board.mk
@@ -28,5 +28,7 @@ else
 $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
 endif
 
-DDEFS += -DSHORT_BOARD_NAME=alphax-8chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
+
+DDEFS += -DSHORT_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 7c9dd57c75..ff68a07800 100644
--- a/firmware/config/boards/hellen/alphax-8chan/board.mk
+++ b/firmware/config/boards/hellen/alphax-8chan/board.mk
@@ -29,6 +29,7 @@ else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
 else
 $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
 endif
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
 
-DDEFS += -DSHORT_BOARD_NAME=alphax-8chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
+DDEFS += -DSHORT_BOARD_NAME=alphax-8chan
 DDEFS += -DHW_HELLEN_8CHAN=1
diff --git a/firmware/config/boards/hellen/hellen-gm-e67/board.mk b/firmware/config/boards/hellen/hellen-gm-e67/board.mk
index 7c4c4eb00d..375ea5027c 100644
--- a/firmware/config/boards/hellen/hellen-gm-e67/board.mk
+++ b/firmware/config/boards/hellen/hellen-gm-e67/board.mk
@@ -11,6 +11,7 @@ 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_GM_E67
 
-DDEFS += -DSHORT_BOARD_NAME=hellen-gm-e67 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_GM_E67
+DDEFS += -DSHORT_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 3428d2c88a..47f4ccc306 100644
--- a/firmware/config/boards/hellen/hellen-honda-k/board.mk
+++ b/firmware/config/boards/hellen/hellen-honda-k/board.mk
@@ -17,8 +17,9 @@ DDEFS += -DADC_MUX_PIN=Gpio::F2
 # Add them all together
 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
 
-DDEFS += -DSHORT_BOARD_NAME=hellen-honda-k -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_HONDA_K
+DDEFS += -DSHORT_BOARD_NAME=hellen-honda-k
 DDEFS += -DHW_HELLEN_K=TRUE
 
 include $(BOARDS_DIR)/hellen/hellen-common144.mk
diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellen-nb1/board.mk
index 6f9b7c730d..06afeb0ce9 100644
--- a/firmware/config/boards/hellen/hellen-nb1/board.mk
+++ b/firmware/config/boards/hellen/hellen-nb1/board.mk
@@ -17,7 +17,7 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
 
 # Enable serial pins on expansion header
 DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
-
-DDEFS += -DSHORT_BOARD_NAME=hellen-nb1 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1
+DDEFS += -DSHORT_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 02454706fd..272fbf0dba 100644
--- a/firmware/config/boards/hellen/hellen121nissan/board.mk
+++ b/firmware/config/boards/hellen/hellen121nissan/board.mk
@@ -15,8 +15,9 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 
 # bad temporary solution of hardware issue https://github.com/rusefi/rusefi/issues/4821
 DDEFS += -DMAX_TPS_PPS_DISCREPANCY=10.0f
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121NISSAN
 
-DDEFS += -DSHORT_BOARD_NAME=hellen121nissan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121NISSAN
+DDEFS += -DSHORT_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 ca5f437c91..eefc70fa20 100644
--- a/firmware/config/boards/hellen/hellen121vag/board.mk
+++ b/firmware/config/boards/hellen/hellen121vag/board.mk
@@ -18,8 +18,9 @@ ifeq ($(EFI_LUA_LOOKUP),)
   EFI_LUA_LOOKUP = FALSE
 endif
 DDEFS += -DEFI_LUA_LOOKUP=$(EFI_LUA_LOOKUP)
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121VAG
 
-DDEFS += -DSHORT_BOARD_NAME=hellen121vag -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121VAG
+DDEFS += -DSHORT_BOARD_NAME=hellen121vag
 
 include $(BOARDS_DIR)/hellen/hellen-common176.mk
 
diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk
index 9906331abc..520dd2ff0b 100644
--- a/firmware/config/boards/hellen/hellen128/board.mk
+++ b/firmware/config/boards/hellen/hellen128/board.mk
@@ -14,8 +14,9 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 # Add them all together
 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
 
-DDEFS += -DSHORT_BOARD_NAME=hellen128 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_128
+DDEFS += -DSHORT_BOARD_NAME=hellen128
 
 include $(BOARDS_DIR)/hellen/hellen-common176.mk
 
diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk
index 50c76c8794..d30a8f7cdd 100644
--- a/firmware/config/boards/hellen/hellen154hyundai/board.mk
+++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk
@@ -15,8 +15,9 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 # Add them all together
 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
 
-DDEFS += -DSHORT_BOARD_NAME=hellen154hyundai -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_154_HYUNDAI
+DDEFS += -DSHORT_BOARD_NAME=hellen154hyundai
 
 include $(BOARDS_DIR)/hellen/hellen-common144.mk
 DDEFS += -DHW_HELLEN_HYUNDAI=1
\ No newline at end of file
diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
index 76dfa2f8db..9c8a790d88 100644
--- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
+++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
@@ -15,7 +15,8 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 
 # https://github.com/rusefi/hellenNA6_issues/issues/35 hack :(
 DDEFS += -DDISABLE_PIN_STATE_VALIDATION=TRUE
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA6
 
-DDEFS += -DSHORT_BOARD_NAME=hellenNA6 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA6
+DDEFS += -DSHORT_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 ba9d7ade5d..893e8be2a9 100644
--- a/firmware/config/boards/hellen/hellen72/board.mk
+++ b/firmware/config/boards/hellen/hellen72/board.mk
@@ -14,8 +14,9 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 # Add them all together
 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
 
-DDEFS += -DSHORT_BOARD_NAME=hellen72 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_72
+DDEFS += -DSHORT_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 4a3bbfe02c..55354561f0 100644
--- a/firmware/config/boards/hellen/hellen81/board.mk
+++ b/firmware/config/boards/hellen/hellen81/board.mk
@@ -22,8 +22,8 @@ DDEFS += -DSTM32_PWM_USE_TIM3=FALSE
 # for analog VR we want to access un-averaged most raw data
 # DDEFS += -DADC_BUF_DEPTH_FAST=1
 # DDEFS += -DADC_BUF_NUM_AVG=1
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_81
 
-
-DDEFS += -DSHORT_BOARD_NAME=hellen81 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_81
+DDEFS += -DSHORT_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 15988c148b..d750621c08 100644
--- a/firmware/config/boards/hellen/hellen88bmw/board.mk
+++ b/firmware/config/boards/hellen/hellen88bmw/board.mk
@@ -12,7 +12,8 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
 # Add them all together
 DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE)
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_88_BMW
 
-DDEFS += -DSHORT_BOARD_NAME=hellen88bmw -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_88_BMW
+DDEFS += -DSHORT_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 7fc0e1cfac..818e32a563 100644
--- a/firmware/config/boards/hellen/hellenNA8_96/board.mk
+++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk
@@ -13,8 +13,8 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 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 += -DSHORT_BOARD_NAME=hellenNA8_96 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA8_96
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA8_96
+DDEFS += -DSHORT_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 517018aa1e..c30a0271e4 100644
--- a/firmware/config/boards/hellen/small-can-board/board.mk
+++ b/firmware/config/boards/hellen/small-can-board/board.mk
@@ -1,7 +1,9 @@
 BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
 
 DDEFS += -DFIRMWARE_ID=\"small-can-board\"
-DDEFS += -DSHORT_BOARD_NAME=small-can-board -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SMALL_CAN_BOARD
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SMALL_CAN_BOARD
+
+DDEFS += -DSHORT_BOARD_NAME=small-can-board
 
 #DDEFS += -DEFI_SENT_SUPPORT=TRUE
 
diff --git a/firmware/config/boards/kinetis/board.mk b/firmware/config/boards/kinetis/board.mk
index 5e3a49a095..eb893e72cc 100644
--- a/firmware/config/boards/kinetis/board.mk
+++ b/firmware/config/boards/kinetis/board.mk
@@ -13,8 +13,9 @@ BOARDCPPSRC += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS)
 LDSCRIPT = $(STARTUPLD_KINETIS)/MKE1xF512.ld
 
 CONFDIR = $(BOARD_DIR)
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_KIN
 
-DDEFS += -DSHORT_BOARD_NAME=kin -DSTATIC_BOARD_ID=STATIC_BOARD_ID_KIN
+DDEFS += -DSHORT_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 4641164e2b..7069dfb7f1 100644
--- a/firmware/config/boards/m74_9/board.mk
+++ b/firmware/config/boards/m74_9/board.mk
@@ -11,4 +11,7 @@ USE_FATFS = no
 
 DDEFS += -DFIRMWARE_ID=\"m74_9\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
-DDEFS += -DSHORT_BOARD_NAME=m74_9 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_M74_9
+DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_M74_9
+
+DDEFS += -DSHORT_BOARD_NAME=m74_9
+
diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk
index d26876ad77..03f97377ba 100644
--- a/firmware/config/boards/microrusefi/board.mk
+++ b/firmware/config/boards/microrusefi/board.mk
@@ -46,9 +46,11 @@ DDEFS += -DHW_MICRO_RUSEFI=1
 
 ifeq ($(PROJECT_CPU),ARCH_STM32F7)
     USE_OPT += -Wl,--defsym=FLASH_SIZE=768k
-	DDEFS += -DSHORT_BOARD_NAME=mre_f7 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7
+    DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7
+	DDEFS += -DSHORT_BOARD_NAME=mre_f7
 else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
-	DDEFS += -DSHORT_BOARD_NAME=mre_f4 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4
+    DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4
+	DDEFS += -DSHORT_BOARD_NAME=mre_f4
 else
 $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
 endif