From 32ba5bc0d97649e715cff5713ac30e73e21887ab Mon Sep 17 00:00:00 2001 From: Andrei Date: Mon, 17 Apr 2017 18:22:09 +0300 Subject: [PATCH] custom-board-makefile pull request --- firmware/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 3bf02581e4..1a8ec69c54 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -99,7 +99,7 @@ PROJECT_DIR = . CHIBIOS = ChibiOS3 CHIBIOS_CONTRIB = ChibiOS-Contrib -ifneq ($(PROJECT_BOARD),OLIMEX_STM32_E407) +ifeq ($(PROJECT_BOARD),) PROJECT_BOARD = ST_STM32F4 endif DDEFS += -D$(PROJECT_BOARD) @@ -138,7 +138,9 @@ include $(PROJECT_DIR)/controllers/trigger/trigger.mk include $(PROJECT_DIR)/console/console.mk # Define linker script file here -LDSCRIPT= config/stm32f4ems/STM32F407xG_CCM.ld +ifeq ($(LDSCRIPT),) + LDSCRIPT= config/stm32f4ems/STM32F407xG_CCM.ld +endif # C sources that can be compiled in ARM or THUMB mode depending on the global # setting.