From 850bb9c1ebe61b3fbb3fb4450bb448b2e83fc69d Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sat, 9 Apr 2022 18:48:33 -0400
Subject: [PATCH] refactoring: using VAR_DEF_ENGINE_TYPE bash variable for
 DEFAULT_ENGINE_TYPE Makefile variable

---
 firmware/config/boards/clean_env_variables.sh               | 2 +-
 firmware/config/boards/f407-discovery/board.mk              | 5 ++---
 firmware/config/boards/hellen/hellen-nb1/board.mk           | 6 +++---
 firmware/config/boards/hellen/hellen121nissan/board.mk      | 6 +++---
 firmware/config/boards/hellen/hellen121vag/board.mk         | 6 +++---
 firmware/config/boards/hellen/hellen128/board.mk            | 6 +++---
 firmware/config/boards/hellen/hellen154hyundai/board.mk     | 6 +++---
 firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk | 6 +++---
 firmware/config/boards/hellen/hellen72/board.mk             | 6 +++---
 firmware/config/boards/hellen/hellen88bmw/board.mk          | 6 +++---
 firmware/config/boards/hellen/hellenNA8_96/board.mk         | 6 +++---
 .../config/boards/microrusefi/!compile-nucleo-Manhattan.bat | 4 +---
 firmware/config/boards/microrusefi/board.mk                 | 2 +-
 .../microrusefi/compile_mre_f4_hardware_QC_special_build.sh | 2 +-
 firmware/config/boards/microrusefi/compile_mre_f4_slave.sh  | 2 +-
 firmware/config/boards/microrusefi/compile_mre_f7_test.sh   | 2 +-
 firmware/config/boards/prometheus/prometheus-common.mk      | 1 -
 .../proteus/compile_proteus_f4_hardware_QC_special_build.sh | 2 +-
 .../proteus/compile_proteus_f7_hardware_QC_special_build.sh | 2 +-
 firmware/config/boards/subaru_eg33/make.sh                  | 2 +-
 20 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/firmware/config/boards/clean_env_variables.sh b/firmware/config/boards/clean_env_variables.sh
index a90837b334..dca5484d22 100644
--- a/firmware/config/boards/clean_env_variables.sh
+++ b/firmware/config/boards/clean_env_variables.sh
@@ -6,7 +6,7 @@ export EXTRA_PARAMS=""
 export PROJECT_BOARD=""
 export PROJECT_CPU=""
 export USE_BOOTLOADER=""
-export DEFAULT_ENGINE_TYPE=""
+export VAR_DEF_ENGINE_TYPE=""
 export LED_CRITICAL_ERROR_BRAIN_PIN=""
 export BUILDDIR=""
 export DEBUG_LEVEL_OPT=""
diff --git a/firmware/config/boards/f407-discovery/board.mk b/firmware/config/boards/f407-discovery/board.mk
index bf2384ee7d..aa25040716 100644
--- a/firmware/config/boards/f407-discovery/board.mk
+++ b/firmware/config/boards/f407-discovery/board.mk
@@ -4,9 +4,8 @@ BOARDCPPSRC = $(PROJECT_DIR)/config/boards/f407-discovery/board_extra.cpp
 # MCU defines
 DDEFS += -DSTM32F407xx
 
-# 'DEFAULT_ENGINE_TYPE' env variable is used to define DEFAULT_ENGINE_TYPE macro, confusing name reuse!
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO
 endif
 
 # here we use different names for env variable and macro name in order to reduce confusion. overall this is about Frankenso builds defining FIRMWARE_ID
diff --git a/firmware/config/boards/hellen/hellen-nb1/board.mk b/firmware/config/boards/hellen/hellen-nb1/board.mk
index 8cf68eb696..5f7f1bf127 100644
--- a/firmware/config/boards/hellen/hellen-nb1/board.mk
+++ b/firmware/config/boards/hellen/hellen-nb1/board.mk
@@ -5,14 +5,14 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen-nb1/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen-nb1
 
 # Set this if you want a default engine type other than normal hellen-nb1
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB1
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB1
 endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellen121nissan/board.mk b/firmware/config/boards/hellen/hellen121nissan/board.mk
index d61e78b5b6..1c200da3dc 100644
--- a/firmware/config/boards/hellen/hellen121nissan/board.mk
+++ b/firmware/config/boards/hellen/hellen121nissan/board.mk
@@ -5,8 +5,8 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen121nissan/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen121nissan
 
 # Set this if you want a default engine type other than normal hellen121nissan
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_121_NISSAN_6_CYL
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_121_NISSAN_6_CYL
 endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
@@ -15,7 +15,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellen121nissan\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellen121nissan\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellen121vag/board.mk b/firmware/config/boards/hellen/hellen121vag/board.mk
index 6ae72c848f..7559e0e926 100644
--- a/firmware/config/boards/hellen/hellen121vag/board.mk
+++ b/firmware/config/boards/hellen/hellen121vag/board.mk
@@ -5,8 +5,8 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen121vag/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen121vag
 
 # Set this if you want a default engine type other than normal hellen121vag
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_121_VAG_4_CYL
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_121_VAG_4_CYL
 endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
@@ -15,7 +15,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellen121vag\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellen121vag\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk
index bf0206f4c0..e0786fe85c 100644
--- a/firmware/config/boards/hellen/hellen128/board.mk
+++ b/firmware/config/boards/hellen/hellen128/board.mk
@@ -6,8 +6,8 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen128/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen128
 
 # Set this if you want a default engine type other than normal hellen128
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_128_MERCEDES_4_CYL
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_128_MERCEDES_4_CYL
 endif
 
 
@@ -17,7 +17,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellen128\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk
index ca7b874007..83fd7c0e85 100644
--- a/firmware/config/boards/hellen/hellen154hyundai/board.mk
+++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk
@@ -5,8 +5,8 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen154hyundai/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen154hyundai
 
 # Set this if you want a default engine type other than normal hellen121nissan
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_154_HYUNDAI_COUPE_BK2
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_154_HYUNDAI_COUPE_BK2
 endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
@@ -15,7 +15,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
index 6eb8b54ff7..79632b5b3c 100644
--- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
+++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk
@@ -5,8 +5,8 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen64_miataNA6_94/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen64_miataNA6_94
 
 # Set this if you want a default engine type other than normal hellen64_miataNA6_94
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA6
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA6
 endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
@@ -15,7 +15,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellenNA6\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellenNA6\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellen72/board.mk b/firmware/config/boards/hellen/hellen72/board.mk
index 92dc19af68..71b92cf340 100644
--- a/firmware/config/boards/hellen/hellen72/board.mk
+++ b/firmware/config/boards/hellen/hellen72/board.mk
@@ -6,8 +6,8 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen72
 
 # Set this if you want a default engine type other than normal Hellen72
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NB2
 endif
 
 
@@ -17,7 +17,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellen72\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk
index 01d800584b..4de665404b 100644
--- a/firmware/config/boards/hellen/hellen88bmw/board.mk
+++ b/firmware/config/boards/hellen/hellen88bmw/board.mk
@@ -5,8 +5,8 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen88bmw/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen88bmw
 
 # Set this if you want a default engine type other than normal hellen88bmw
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_88_BMW
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_88_BMW
 endif
 
 
@@ -16,7 +16,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 DDEFS += -DTS_NO_PRIMARY=1
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 
diff --git a/firmware/config/boards/hellen/hellenNA8_96/board.mk b/firmware/config/boards/hellen/hellenNA8_96/board.mk
index 9c80bc88ca..7f57ba187c 100644
--- a/firmware/config/boards/hellen/hellenNA8_96/board.mk
+++ b/firmware/config/boards/hellen/hellenNA8_96/board.mk
@@ -5,14 +5,14 @@ BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellenNA8_96/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellenNA8_96
 
 # Set this if you want a default engine type other than normal hellen-nb1
-ifeq ($(DEFAULT_ENGINE_TYPE),)
-  DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA8_96
+ifeq ($(VAR_DEF_ENGINE_TYPE),)
+  VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=HELLEN_NA8_96
 endif
 
 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
 
 # Add them all together
-DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_ENGINE_TYPE)
 DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
 include $(BOARDS_DIR)/hellen/hellen-common144.mk
diff --git a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat
index 9800288f83..6a90524963 100644
--- a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat
+++ b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat
@@ -4,13 +4,11 @@ cd ../../..
 set PROJECT_BOARD=microrusefi
 set PROJECT_CPU=ARCH_STM32F7
 
-set DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_F
+set VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_F
 set LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOB_14
 
 set EXTRA_PARAMS=-DDUMMY ^
  -DEFI_COMMUNICATION_PIN=GPIOB_7
 
-rem -DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST
-
 call config/boards/common_make.bat
 
diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk
index 29786268b9..e3d4aea73c 100644
--- a/firmware/config/boards/microrusefi/board.mk
+++ b/firmware/config/boards/microrusefi/board.mk
@@ -27,7 +27,7 @@ DDEFS += -DEFI_CJ125=FALSE -DBOARD_L9779_COUNT=0 -DEFI_HD44780_LCD=FALSE -DEFI_L
 
 # Add them all together
 DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"microRusEFI\" $(LED_CRITICAL_ERROR_BRAIN_PIN) $(EFI_CONSOLE_TTL_PINS) -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
-DDEFS += $(DEFAULT_ENGINE_TYPE)
+DDEFS += $(VAR_DEF_ENGINE_TYPE)
 
 # We are running on microRusEFI hardware!
 DDEFS += -DHW_MICRO_RUSEFI=1
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
index 147255009e..45e7a3a963 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
@@ -4,7 +4,7 @@ export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
 export EXTRA_PARAMS="-DHW_CHECK_MODE=TRUE -DANALOG_HW_CHECK_MODE=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE -DSHORT_BOARD_NAME=mre_f4 -DRAMDISK_INVALID"
 
-export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST
+export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST
 
 # this QC configuration is used to assert our status with debug info
 export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
index 5ab4251261..2ddaa2a942 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
@@ -4,7 +4,7 @@ export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
 export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE -DSHORT_BOARD_NAME=mre_f4
 
-export DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE
+export VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE
 
 bash ../common_make.sh
 
diff --git a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
index f798167330..e633baab87 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
@@ -3,6 +3,6 @@
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F7
 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre_f7
-export DEFAULT_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
+export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
 
 bash ../common_make.sh
diff --git a/firmware/config/boards/prometheus/prometheus-common.mk b/firmware/config/boards/prometheus/prometheus-common.mk
index a47afcd1ea..3d1b0aa909 100644
--- a/firmware/config/boards/prometheus/prometheus-common.mk
+++ b/firmware/config/boards/prometheus/prometheus-common.mk
@@ -23,6 +23,5 @@ endif
 ifeq ($(PROMETHEUS_BOARD),405)
 	DDEFS += -DFIRMWARE_ID=\"prometeus405\"
 else
-	# Override DEFAULT_ENGINE_TYPE
 	DDEFS += -DFIRMWARE_ID=\"prometeus469\"
 endif
diff --git a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
index 00c2bd4e47..88e7fe7f66 100755
--- a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
@@ -4,7 +4,7 @@ export PROJECT_BOARD=proteus
 export PROJECT_CPU=ARCH_STM32F4
 export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE -DSHORT_BOARD_NAME=proteus_f4"
 
-export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
+export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
 
 # export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
 
diff --git a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
index 8f27e125b3..c07650c352 100755
--- a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
@@ -4,7 +4,7 @@ export PROJECT_BOARD=proteus
 export PROJECT_CPU=ARCH_STM32F7
 export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE -DSHORT_BOARD_NAME=proteus_f7"
 
-export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
+export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
 
 # export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
 
diff --git a/firmware/config/boards/subaru_eg33/make.sh b/firmware/config/boards/subaru_eg33/make.sh
index 46c24beb20..709cef5efb 100755
--- a/firmware/config/boards/subaru_eg33/make.sh
+++ b/firmware/config/boards/subaru_eg33/make.sh
@@ -2,7 +2,7 @@
 export PROJECT_BOARD=subaru_eg33
 export PROJECT_CPU=ARCH_STM32F7
 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"
+export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS"
 #echo $EXTRA_PARAMS
 #export DEBUG_LEVEL_OPT="-O0"