rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bootloader build (#2907) 

* Chibios-Contrib fix

* hm?!!

* Chibios-Contrib path is also relative to PROJECT_DIR

* Revert "Chibios-Contrib path is also relative to PROJECT_DIR"

This reverts commit 8cab5c5508df5fb57b2fe86d80589a3081cbf56c.
This commit is contained in:
Andrey G 2021-07-05 21:18:05 +03:00 committed by GitHub
parent 19e991ffd8
commit b1a2295917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/bootloader/src/Makefile
View File

@ -116,7 +116,7 @@ endif
# Define project name here # Define project name here
PROJECT = bootloader PROJECT = bootloader
PROJECT_DIR = .. PROJECT_DIR = ../..
# Imported source files and paths # Imported source files and paths
CHIBIOS = $(PROJECT_DIR)/ChibiOS CHIBIOS = $(PROJECT_DIR)/ChibiOS
@ -137,7 +137,7 @@ include $(CHIBIOS)/os/license/license.mk
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/$(CPU_STARTUP) include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/$(CPU_STARTUP)
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
include $(CHIBIOS_CONTRIB)/os/hal/hal.mk include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/STM32/$(CPU_PLATFORM) include $(CPU_PLATFORM)
include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
# RTOS files (optional). # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
@ -210,7 +210,7 @@ TCPPSRC =
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(ALLINC) \ INCDIR = $(ALLINC) \
.. \ ../.. \
$(CHIBIOS)/os/various \ $(CHIBIOS)/os/various \
$(CHIBIOS)/os/ex/ST \ $(CHIBIOS)/os/ex/ST \
$(CHIBIOS)/os/hal/lib/peripherals/sensors \ $(CHIBIOS)/os/hal/lib/peripherals/sensors \