diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile
index 9d650b5b11..73a14fee7d 100644
--- a/firmware/bootloader/src/Makefile
+++ b/firmware/bootloader/src/Makefile
@@ -137,6 +137,7 @@ include $(PROJECT_DIR)/util/util.mk
 
 include $(PROJECT_DIR)/controllers/controllers.mk
 include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_ports.mk
+include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
 
 # Define linker script file here
 ifeq ($(LDSCRIPT),)
@@ -159,6 +160,7 @@ CSRC = $(STARTUPSRC) \
 	$(CONSOLESRC) \
 	$(DEV_SRC) \
 	$(HW_LAYER_EMS) \
+	$(HW_LAYER_DRIVERS_CORE) \
 	$(CONTROLLERS_ALGO_SRC) \
 	$(CONTROLLERS_CORE_SRC) \
 	$(CONTROLLERS_SENSORS_SRC) \
@@ -253,7 +255,8 @@ INCDIR = .. $(CHIBIOS)/os/license \
 	$(PROJECT_DIR)/hw_layer/lcd \
 	$(PROJECT_DIR)/hw_layer/sensors \
 	$(PROJECT_DIR)/hw_layer/mass_storage \
-	$(PROJECT_DIR)/hw_layer/stm32f4 \
+	$(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER) \
+	$(HW_LAYER_DRIVERS_INC) \
 	$(PROJECT_DIR)/development \
 	$(PROJECT_DIR)/development/hw_layer \
 	$(PROJECT_DIR)/development/test \
diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp
index f34218564d..69d4f10dca 100644
--- a/firmware/config/engines/custom_engine.cpp
+++ b/firmware/config/engines/custom_engine.cpp
@@ -343,7 +343,7 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->tle8888_cs = GPIOD_5;
 	engineConfiguration->directSelfStimulation = true;
 
-#if STM32_HAS_GPIOG	
+#if defined(STM32_HAS_GPIOG) && STM32_HAS_GPIOG
 	boardConfiguration->ignitionPins[0] = GPIOG_3;
 	boardConfiguration->ignitionPins[1] = GPIOG_4;
 	boardConfiguration->ignitionPins[2] = GPIOG_5;
@@ -370,7 +370,7 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	// IN1 PF15
 	// IN2 PF14
 	// SF  PF11
-#if STM32_HAS_GPIOF
+#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF
 #if EFI_FSIO
 	setFsio(12, GPIOF_12, "0" PASS_CONFIG_PARAMETER_SUFFIX);
 	setFsio(14, GPIOF_13, "1" PASS_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp
index 5028f3ebf9..569866d018 100644
--- a/firmware/config/engines/me7pnp.cpp
+++ b/firmware/config/engines/me7pnp.cpp
@@ -110,10 +110,10 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	boardConfiguration->clutchDownPin = GPIOD_11;
 	engineConfiguration->brakePedalPin = GPIOE_10;
 	engineConfiguration->camInput = GPIOA_2;
-#if STM32_HAS_GPIOG
+#if defined(STM32_HAS_GPIOG) && STM32_HAS_GPIOG
 	boardConfiguration->triggerInputPins[0] = GPIOG_7;
 #endif /* STM32_HAS_GPIOF */
-#if STM32_HAS_GPIOF
+#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF
 	boardConfiguration->vehicleSpeedSensorInputPin = GPIOF_14;
 #endif /* STM32_HAS_GPIOF */
 	boardConfiguration->tachOutputPin = TLE8888_PIN_16;
@@ -132,7 +132,7 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	//ETB Settings
 
 #if EFI_FSIO
-#if STM32_HAS_GPIOF
+#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF
 	setFsio (12, GPIOF_12, "0" PASS_CONFIG_PARAMETER_SUFFIX);
 	setFsio (14, GPIOF_13, "1" PASS_CONFIG_PARAMETER_SUFFIX);
 #endif /* STM32_HAS_GPIOF */
@@ -140,7 +140,7 @@ void vag_18_Turbo(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 #endif
 	engineConfiguration->auxPidFrequency[3] = 25;
 	CONFIG(etb1_use_two_wires) = true;
-#if STM32_HAS_GPIOF
+#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF
 	CONFIGB(etb1.directionPin1) = GPIOF_15;
 	CONFIGB(etb1.directionPin2) = GPIOF_14;
 #endif /* STM32_HAS_GPIOF */