From 0922cd67ccbd49bb887a2ddb638d499341fd1920 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 1 Apr 2019 02:23:18 -0400 Subject: [PATCH] fixing build --- firmware/bootloader/src/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile index dde9866a62..ad1bfe19b6 100644 --- a/firmware/bootloader/src/Makefile +++ b/firmware/bootloader/src/Makefile @@ -126,6 +126,7 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk include $(CONFIG)/boards/$(PROJECT_BOARD)/board.mk +include $(PROJECT_DIR)/util/util.mk include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_ports.mk @@ -146,7 +147,6 @@ CSRC = $(STARTUPSRC) \ $(CHIBIOS)/os/various/syscalls.c \ $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ - $(UTILSRC) \ $(ENGINES_SRC) \ $(CONSOLESRC) \ $(DEV_SRC) \ @@ -175,7 +175,6 @@ CPPSRC = $(CHCPPSRC) \ $(CONSOLE_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \ $(CONTROLLERS_SRC_CPP) \ - $(UTILSRC_CPP) \ $(CONTROLLERS_CORE_SRC_CPP) \ $(CONTROLLERS_MATH_SRC_CPP) \ $(PROJECT_DIR)/console/binary/tunerstudio_io.cpp \ @@ -236,8 +235,7 @@ INCDIR = .. $(CHIBIOS)/os/license \ $(CONFIG)/engines \ $(PROJECT_DIR)/ext \ $(PROJECT_DIR)/ext_algo \ - $(PROJECT_DIR)/util \ - $(PROJECT_DIR)/util/containers \ + $(UTIL_INC) \ $(PROJECT_DIR)/console_util \ $(PROJECT_DIR)/console \ $(PROJECT_DIR)/console/binary \