From 69f262c969d391589d14df60b2e62eea21ea58db Mon Sep 17 00:00:00 2001 From: Rene Hopf Date: Thu, 12 Apr 2018 01:46:12 +0200 Subject: [PATCH] optional toolchain-user.mak include file --- .gitignore | 1 + Makefile | 1 - base.mak | 3 +++ bootloader/Makefile | 1 - f3_boot/Makefile | 1 - stm32f303/Makefile | 1 - toolchain.mak | 1 + 7 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index febfebaf..4e4f259f 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ src/conf_templates.c stm32f303/inc/commandslist.h stm32f303/inc/hal_tbl.h stm32f303/src/hal_tbl.c +toolchain-user.mak diff --git a/Makefile b/Makefile index fdedc86e..f0b5fd10 100644 --- a/Makefile +++ b/Makefile @@ -349,7 +349,6 @@ clean: # Include the base rules # include base.mak -include toolchain.mak # Include the dependency files # diff --git a/base.mak b/base.mak index a1e8ef81..eac25290 100644 --- a/base.mak +++ b/base.mak @@ -86,3 +86,6 @@ flash: $(TARGET).bin %.dfu: %.bin @cp $< $@ @$(DFU-SUFFIX) -v 0483 -p df11 -a $@ + +include toolchain.mak +-include toolchain-user.mak diff --git a/bootloader/Makefile b/bootloader/Makefile index 4c52513b..e22c3959 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -148,7 +148,6 @@ clean: # Include the base rules # include base.mak -include toolchain.mak # Include the dependency files # diff --git a/f3_boot/Makefile b/f3_boot/Makefile index a6f22637..7244bf17 100644 --- a/f3_boot/Makefile +++ b/f3_boot/Makefile @@ -168,7 +168,6 @@ clean: # Include the base rules # include base.mak -include toolchain.mak # Include the dependency files # diff --git a/stm32f303/Makefile b/stm32f303/Makefile index 04a86b2d..623f05a2 100644 --- a/stm32f303/Makefile +++ b/stm32f303/Makefile @@ -216,7 +216,6 @@ clean: # Include the base rules # include base.mak -include toolchain.mak # Include the dependency files # diff --git a/toolchain.mak b/toolchain.mak index fff6147b..a09d6f5c 100644 --- a/toolchain.mak +++ b/toolchain.mak @@ -1,4 +1,5 @@ # Define programs and commands for the toolchain +# Do not modiy this file. Instead create a file toolchain-user.mak which can overwrite anything in here. PYTHON = python DFU-UTIL = dfu-util DFU-SUFFIX = dfu-suffix