Simplify Makefile, unify board.mk files (#2229)

* Proper way to add lis302 driver * Proper way to add license directory to includes * Makefile: simplify All ChibiOS stuff is accumulated in ALLCSRC, ALLINC and so on. * board.mk: append sources and includes to ALLSRC, ALLCPPSRC, ALLINC * Cypress: fix CANv2 includence into build
2021-01-17 17:32:06 +03:00 · 2021-01-17 17:32:06 +03:00 · d134fabc51
parent a294dfeadd
commit d134fabc51
12 changed files with 112 additions and 86 deletions
--- a/firmware/Makefile
+++ b/firmware/Makefile
@ -153,6 +153,9 @@ ifeq ($(CONFDIR),)
  CONFDIR = $(PROJECT_DIR)/config/stm32f4ems
 endif

+# Include various ChibiOS mk files
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CPU_STARTUP_DIR)
 # HAL-OSAL files (optional).
@ -162,12 +165,16 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# EX files (optional).
+include $(CHIBIOS)/os/ex/ST/lis302dl.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/cpp_wrappers/chcpp.mk

 ifeq ($(USE_FATFS),yes)
 include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
 endif
-include $(CHIBIOS)/os/various/cpp_wrappers/chcpp.mk

+#Now include RusEFI mk files
 include console/binary/tunerstudio.mk
 ifeq ($(USE_FATFS),yes)
 include $(PROJECT_DIR)/ext/fatfs.mk
@ -200,25 +207,17 @@ endif

 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(STARTUPSRC) \
-	$(KERNSRC) \
-	$(PORTSRC) \
-	$(OSALSRC) \
-	$(HALSRC) \
-	$(HALSRC_CONTRIB) \
-	$(PLATFORMSRC) \
-	$(PLATFORMSRC_CONTRIB) \
-	$(BOARDSRC) \
-	$(BOOTLOADERSRC) \
-	$(CHIBIOS)/os/ex/ST/lis302dl.c \
+CSRC =  $(ALLCSRC) \
 	$(CHIBIOS)/os/various/syscalls.c \
-	$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
-	$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
+	$(TRIGGER_SRC) \
+	$(TRIGGER_DECODERS_SRC) \
+	$(DEV_SRC) \
+	$(BOOTLOADERSRC) \
 	${HW_MASS_STORAGE_SRC_C} \
 	$(UTILSRC) \
+	$(SYSTEMSRC) \
 	$(ENGINES_SRC) \
 	$(CONSOLESRC) \
-	$(DEV_SRC) \
 	$(HW_LAYER_EMS) \
 	$(HW_LAYER_DRIVERS_CORE) \
 	$(HW_LAYER_DRIVERS) \
@ -226,28 +225,27 @@ CSRC = $(STARTUPSRC) \
 	$(CONTROLLERS_ALGO_SRC) \
 	$(CONTROLLERS_CORE_SRC) \
 	$(CONTROLLERS_SENSORS_SRC) \
-	$(FATFSSRC) \
 	$(SYSTEMSRC) \
 	main_hardfault.c

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CPPSRC = $(CHCPPSRC) \
+CPPSRC = $(ALLCPPSRC) \
 	$(TRIGGER_SRC_CPP) \
 	$(TRIGGER_DECODERS_SRC_CPP) \
 	$(DEV_SRC_CPP) \
 	$(CONTROLLERS_ALGO_SRC_CPP) \
+	$(UTILSRC_CPP) \
 	$(SYSTEMSRC_CPP) \
-	$(BOARDSRC_CPP) \
 	$(ENGINES_SRC_CPP) \
 	$(HW_LAYER_EMS_CPP) \
+	$(HW_LAYER_DRIVERS_CORE_CPP) \
 	$(HW_LAYER_DRIVERS_CPP) \
 	$(HW_SENSORS_SRC) \
 	$(TUNERSTUDIO_SRC_CPP) \
 	$(CONSOLE_SRC_CPP) \
 	$(CONTROLLERS_SENSORS_SRC_CPP) \
 	$(CONTROLLERS_SRC_CPP) \
-	$(UTILSRC_CPP) \
 	$(CONTROLLERS_CORE_SRC_CPP) \
 	$(CONTROLLERS_MATH_SRC_CPP) \
 	$(INIT_SRC_CPP) \
@ -275,33 +273,15 @@ TCSRC =
 TCPPSRC =

 # List ASM source files here
-# List ASM source files here
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) \
+ASMXSRC = $(ALLXASMSRC) \
 	$(RUSEFIASM)

-ifeq ($(CONFIGPATH),)
-  CONFIGPATH=config/stm32f4ems
-endif
-
-
-INCDIR = $(CHIBIOS)/os/license \
-        $(PORTINC) \
-	$(OSALINC) \
-	$(KERNINC) \
+INCDIR = $(ALLINC) \
 	$(TESTINC) \
-	$(STARTUPINC) \
-	$(HALINC) \
-	$(HALINC_CONTRIB) \
-	$(PLATFORMINC) \
-	$(PLATFORMINC_CONTRIB) \
-	$(BOARDINC) \
 	$(BOOTLOADERINC) \
-	$(CHCPPINC) \
-	$(CHIBIOS)/os/hal/lib/streams \
 	$(CHIBIOS)/os/various \
-	$(CHIBIOS)/os/ex/ST \
 	$(CHIBIOS)/os/hal/lib/peripherals/sensors \
-	$(CONFIGPATH) \
+	$(CONFDIR) \
 	config/engines \
 	config \
 	ext \
--- a/firmware/config/boards/hellen/hellen72/board.mk
+++ b/firmware/config/boards/hellen/hellen72/board.mk
@ -1,24 +1,24 @@
 # Combine the related files for a specific platform and MCU.

 # Target ECU board design
-BOARDSRC_CPP = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp
+BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp
 BOARDINC = $(BOARDS_DIR)/hellen/hellen72

 # Target processor details
 ifeq ($(PROJECT_CPU),ARCH_STM32F4)
-  MCU_DEFS = -DSTM32F427xx
-  BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
+  MCU_DEFS  = -DSTM32F427xx
+  BOARDSRC  = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
  BOARDINC += $(PROJECT_DIR)/config/stm32f4ems	# For board.h
  BOARDINC += $(BOARDS_DIR)/st_stm32f4
-  LDSCRIPT = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
+  LDSCRIPT  = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
 else
  # todo: add support for STM32H7
-  MCU_DEFS = -DSTM32H743xx
-  BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
-  CONFDIR = config/stm32h7ems
+  MCU_DEFS  = -DSTM32H743xx
+  BOARDSRC  = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
+  CONFDIR   = config/stm32h7ems
  BOARDINC += $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI # For board.h
  BOARDINC += $(PROJECT_DIR)/config/stm32h7ems	# efifeatures/halconf/chconf.h
-  LDSCRIPT= $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld/STM32H743xI.ld
+  LDSCRIPT  = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld/STM32H743xI.ld
 endif

 # Set this if you want a default engine type other than normal Hellen72
@ -40,3 +40,8 @@ DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen72\" $(DEFAULT_ENG

 # We are running on Hellen-One hardware!
 DDEFS += -DHW_HELLEN=1
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/me7_pnp/board.mk
+++ b/firmware/config/boards/me7_pnp/board.mk
@ -1,6 +1,6 @@
 # List of all the board related files.
 BOARDSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board.c
-BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/me7_pnp/board_configuration.cpp
+BOARDCPPSRC = $(PROJECT_DIR)/config/boards/me7_pnp/board_configuration.cpp

 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/NUCLEO_F767 $(PROJECT_DIR)/config/stm32f7ems
@ -11,3 +11,8 @@ LDSCRIPT= $(PROJECT_DIR)/config/boards/nucleo_f767/STM32F76xxI.ld

 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DDEFAULT_ENGINE_TYPE=VAG_18_TURBO -DSTM32F767xx
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/microrusefi/board.mk
+++ b/firmware/config/boards/microrusefi/board.mk
@ -1,25 +1,25 @@
 # Combine the related files for a specific platform and MCU.

 # Target ECU board design
-BOARDSRC_CPP = $(BOARDS_DIR)/microrusefi/board_configuration.cpp
+BOARDCPPSRC = $(BOARDS_DIR)/microrusefi/board_configuration.cpp

 # Target processor details
 ifeq ($(PROJECT_CPU),ARCH_STM32F4)
-  MCU_DEFS = -DSTM32F407xx
-  BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
-  BOARDINC = $(BOARDS_DIR)/microrusefi
+  MCU_DEFS  = -DSTM32F407xx
+  BOARDSRC  = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
+  BOARDINC  = $(BOARDS_DIR)/microrusefi
  BOARDINC += $(PROJECT_DIR)/config/stm32f4ems	# For board.h
  BOARDINC += $(BOARDS_DIR)/st_stm32f4
  BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h
-  LDSCRIPT= $(BOARDS_DIR)/prometheus/STM32F405xG.ld
+  LDSCRIPT  = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
 else
-  MCU_DEFS = -DSTM32F767xx
-  BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
-  CONFDIR=config/stm32f7ems
-  BOARDINC = $(BOARDS_DIR)/nucleo_f767		# For board.h
+  MCU_DEFS  = -DSTM32F767xx
+  BOARDSRC  = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
+  CONFDIR   = config/stm32f7ems
+  BOARDINC  = $(BOARDS_DIR)/nucleo_f767		# For board.h
  BOARDINC += $(PROJECT_DIR)/config/stm32f7ems	# efifeatures/halconf/chconf.h
  BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h
-  LDSCRIPT= $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld
+  LDSCRIPT  = $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld
 endif

 # Set this if you want a default engine type other than normal MRE
@ -42,3 +42,8 @@ DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"microRusEFI\" $(DEFAULT_

 # We are running on microRusEFI hardware!
 DDEFS += -DHW_MICRO_RUSEFI=1
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/nucleo_f746/board.mk
+++ b/firmware/config/boards/nucleo_f746/board.mk
@ -1,12 +1,17 @@
 # List of all the board related files.
 BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F746ZG/board.c
-BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp
+BOARDCPPSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp

 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f746 $(PROJECT_DIR)/config/stm32f7ems
-CONFDIR=config/stm32f7ems
+CONFDIR = config/stm32f7ems

-LDSCRIPT= $(PROJECT_DIR)/config/boards/nucleo_f746/STM32F746xG.ld
+LDSCRIPT = $(PROJECT_DIR)/config/boards/nucleo_f746/STM32F746xG.ld

 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO -DSTM32F746xx
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/nucleo_f767/board.mk
+++ b/firmware/config/boards/nucleo_f767/board.mk
@ -1,12 +1,17 @@
 # List of all the board related files.
 BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
-BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp
+BOARDCPPSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp

 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f767 $(PROJECT_DIR)/config/stm32f7ems
-CONFDIR=config/stm32f7ems
+CONFDIR = config/stm32f7ems

-LDSCRIPT= $(PROJECT_DIR)/config/boards/nucleo_f767/STM32F76xxI.ld
+LDSCRIPT = $(PROJECT_DIR)/config/boards/nucleo_f767/STM32F76xxI.ld

 # Override DEFAULT_ENGINE_TYPE
 DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DSTM32F767xx
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/nucleo_h743/board.mk
+++ b/firmware/config/boards/nucleo_h743/board.mk
@ -5,5 +5,6 @@ BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
 BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI

 # Shared variables
-ALLCSRC += $(BOARDSRC)
-ALLINC  += $(BOARDINC)
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/prometheus/prometheus-common.mk
+++ b/firmware/config/boards/prometheus/prometheus-common.mk
@ -2,30 +2,35 @@
 BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F469I_DISCOVERY/board.c \
    $(PROJECT_DIR)/config/boards/prometheus/board_extra.c

-BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/Prometheus/board_configuration.cpp
+BOARDCPPSRC = $(PROJECT_DIR)/config/boards/Prometheus/board_configuration.cpp

 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/prometheus

 # This board uses bootloader
-USE_BOOTLOADER=yes
+USE_BOOTLOADER = yes

 # include Prometheus bootloader code
-BOOTLOADERINC= $(PROJECT_DIR)/bootloader/prometheus/$(PROMETHEUS_BOARD)
+BOOTLOADERINC = $(PROJECT_DIR)/bootloader/prometheus/$(PROMETHEUS_BOARD)

 # Default to a release build - clear EXTRA_PARAMS from cmdline to build debug
 ifeq ($(EXTRA_PARAMS),)
-	EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth -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
+	EXTRA_PARAMS = -DSHORT_BOARD_NAME=pth -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
 endif
 ifeq ($(DEBUG_LEVEL_OPT),)
 	DEBUG_LEVEL_OPT = -O2
 endif

 ifeq ($(PROMETHEUS_BOARD),405)
-LDSCRIPT= $(PROJECT_DIR)/config/boards/prometheus/STM32F405xG.ld
-DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F405xx -DFIRMWARE_ID=\"prometeus405\"
+	LDSCRIPT = $(PROJECT_DIR)/config/boards/prometheus/STM32F405xG.ld
+	DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F405xx -DFIRMWARE_ID=\"prometeus405\"
 else
-# Override DEFAULT_ENGINE_TYPE
-LDSCRIPT= $(PROJECT_DIR)/config/boards/prometheus/STM32F469xI.ld
-DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F469xx -DFIRMWARE_ID=\"prometeus469\"
+	# Override DEFAULT_ENGINE_TYPE
+	LDSCRIPT = $(PROJECT_DIR)/config/boards/prometheus/STM32F469xI.ld
+	DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F469xx -DFIRMWARE_ID=\"prometeus469\"
 endif
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/proteus/board.mk
+++ b/firmware/config/boards/proteus/board.mk
@ -1,24 +1,24 @@
 # List of all the board related files.
 BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
-BOARDSRC_CPP =  $(PROJECT_DIR)/config/boards/proteus/board_configuration.cpp \
+BOARDCPPSRC =  $(PROJECT_DIR)/config/boards/proteus/board_configuration.cpp \
 				$(PROJECT_DIR)/config/boards/proteus/adc_hack.cpp
 BOARDINC = $(PROJECT_DIR)/config/boards/proteus

 # Target processor details
 ifeq ($(PROJECT_CPU),ARCH_STM32F4)
-  MCU_DEFS = -DSTM32F407xx
-  BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
+  MCU_DEFS  = -DSTM32F407xx
+  BOARDSRC  = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
  BOARDINC += $(PROJECT_DIR)/config/stm32f4ems	# For board.h
  BOARDINC += $(BOARDS_DIR)/st_stm32f4
-  LDSCRIPT= $(BOARDS_DIR)/prometheus/STM32F405xG.ld
+  LDSCRIPT  = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
 else
-  MCU_DEFS = -DSTM32F767xx
-  BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
+  MCU_DEFS  = -DSTM32F767xx
+  BOARDSRC  = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
  BOARDINC += $(BOARDS_DIR)/nucleo_f767		# For board.h
  BOARDINC += $(PROJECT_DIR)/config/stm32f7ems	# efifeatures/halconf/chconf.h
-  LDSCRIPT= $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld
-  CONFDIR=config/stm32f4ems
-  PROTEUS_LEGACY=TRUE
+  LDSCRIPT  = $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld
+  CONFDIR   = config/stm32f4ems
+  PROTEUS_LEGACY = TRUE
 endif

 # Override DEFAULT_ENGINE_TYPE
@ -40,3 +40,8 @@ DDEFS += -DHW_PROTEUS=1
 ifeq ($(PROTEUS_LEGACY),TRUE)
 	DDEFS +=  -DUSE_ADC3_VBATT_HACK
 endif
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/config/boards/st_stm32f4/board.mk
+++ b/firmware/config/boards/st_stm32f4/board.mk
@ -1,7 +1,7 @@
 # List of all the board related files.
 BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c \
    $(PROJECT_DIR)/config/boards/st_stm32f4/board_extra.c
-BOARDSRC_CPP =
+BOARDCPPSRC =

 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/st_stm32f4
@ -11,3 +11,8 @@ DDEFS += -DSTM32F407xx

 # We are running on Frankenso hardware!
 DDEFS += -DHW_FRANKENSO=1
+
+# Shared variables
+ALLCSRC   += $(BOARDSRC)
+ALLCPPSRC += $(BOARDCPPSRC)
+ALLINC    += $(BOARDINC)
--- a/firmware/controllers/trigger/trigger.mk
+++ b/firmware/controllers/trigger/trigger.mk
@ -1,3 +1,4 @@
+TRIGGER_DECODERS_SRC =

 TRIGGER_DECODERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/trigger/decoders/trigger_mazda.cpp \
@ -17,6 +18,8 @@ TRIGGER_DECODERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/trigger/decoders/trigger_misc.cpp \
 	$(CONTROLLERS_DIR)/trigger/decoders/trigger_universal.cpp

+TRIGGER_SRC =
+
 TRIGGER_SRC_CPP = \
 	$(CONTROLLERS_DIR)/trigger/trigger_emulator_algo.cpp \
 	$(CONTROLLERS_DIR)/trigger/trigger_central.cpp
--- a/firmware/hw_layer/drivers/drivers.mk
+++ b/firmware/hw_layer/drivers/drivers.mk
@ -9,6 +9,8 @@ HW_LAYER_DRIVERS_INC = \
 HW_LAYER_DRIVERS_CORE = \
 	$(DRIVERS_DIR)/gpio/core.c \

+HW_LAYER_DRIVERS_CORE_CPP =
+
 HW_LAYER_DRIVERS = \
 	$(DRIVERS_DIR)/gpio/tle6240.c \
 	$(DRIVERS_DIR)/gpio/tle8888.c \