diff --git a/firmware/config/boards/hellen/cypress/config.mk b/firmware/config/boards/hellen/cypress/config.mk
index 8274c78aae..bfe7e1a1c0 100644
--- a/firmware/config/boards/hellen/cypress/config.mk
+++ b/firmware/config/boards/hellen/cypress/config.mk
@@ -4,10 +4,6 @@ USE_EXCEPTIONS_STACKSIZE = 4096
 
 CYPRESS_CONTRIB = $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/OS
 
-CPU_STARTUP_DIR = $(CYPRESS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_S6E2CxAH.mk
-CPU_PLATFORM_DIR = $(CYPRESS_CONTRIB)/os/hal/ports/Cypress/S6E2CxAH/platform.mk
-CPU_HWLAYER = ports/cypress
-
 GENERATED_ENUMS_DIR = $(BOARD_DIR)/config/controllers/algo
 
 EXTRA_PARAMS += -DFIRMWARE_ID=\"cypress\" -DSHORT_BOARD_NAME=hellen_cypress
diff --git a/firmware/config/boards/kinetis/config.mk b/firmware/config/boards/kinetis/config.mk
index f0e811d791..77c3c5e61e 100644
--- a/firmware/config/boards/kinetis/config.mk
+++ b/firmware/config/boards/kinetis/config.mk
@@ -6,10 +6,6 @@ USE_EXCEPTIONS_STACKSIZE = 2400
 
 KINETIS_CONTRIB = $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/OS
 
-CPU_STARTUP_DIR = $(KINETIS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_ke1xf.mk
-CPU_PLATFORM_DIR = $(KINETIS_CONTRIB)/os/hal/ports/KINETIS/KE1xF/platform.mk
-CPU_HWLAYER = ports/kinetis
-
 GENERATED_ENUMS_DIR = $(BOARD_DIR)/config/controllers/algo
 
 EXTRA_PARAMS += -DFIRMWARE_ID=\"kinetis\" -nodefaultlibs -L$(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/libc -lgcc -ltinyc
diff --git a/firmware/rusefi.mk b/firmware/rusefi.mk
index 6a8f6d72d7..e17400aae9 100644
--- a/firmware/rusefi.mk
+++ b/firmware/rusefi.mk
@@ -31,7 +31,13 @@ else ifeq ($(PROJECT_CPU),ARCH_STM32H7)
 	CPU_PLATFORM = STM32H7xx/platform.mk
 	CPU_HWLAYER = ports/stm32/stm32h7
 else ifeq ($(PROJECT_CPU),kinetis)
+	CPU_STARTUP_DIR = $(KINETIS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_ke1xf.mk
+	CPU_PLATFORM_DIR = $(KINETIS_CONTRIB)/os/hal/ports/KINETIS/KE1xF/platform.mk
+	CPU_HWLAYER = ports/kinetis
 else ifeq ($(PROJECT_CPU),cypress)
+	CPU_STARTUP_DIR = $(CYPRESS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_S6E2CxAH.mk
+	CPU_PLATFORM_DIR = $(CYPRESS_CONTRIB)/os/hal/ports/Cypress/S6E2CxAH/platform.mk
+	CPU_HWLAYER = ports/cypress
 else ifeq ($(PROJECT_CPU),simulator)
 else
 $(error Unexpected PROJECT_CPU)
diff --git a/simulator/Makefile b/simulator/Makefile
index 2959840519..b722005c43 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -85,7 +85,7 @@ endif
 # If enabled, this option makes the build process faster by not compiling
 # modules not used in the current configuration.
 ifeq ($(USE_SMART_BUILD),)
-  USE_SMART_BUILD = yes
+  USE_SMART_BUILD = no
 endif
 
 #