From 02c35eee70ec6e9f5b9a86523fe4b4a8b27b2611 Mon Sep 17 00:00:00 2001 From: Frantisek Burian Date: Mon, 6 Jan 2014 22:11:32 +0100 Subject: [PATCH] Make the STM32 Makefile.includes usable from outside the examples tree (Issue #28) --- examples/Makefile.rules | 2 +- .../stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile | 2 +- .../stm32l-discovery/button-irq-printf-lowpower/Makefile | 3 ++- .../stm32/l1/stm32l-discovery/button-irq-printf/Makefile | 3 ++- examples/stm32/l1/stm32l-discovery/miniblink/Makefile | 2 +- .../stm32/l1/stm32l-discovery/usart-semihosting/Makefile | 7 ++++--- examples/stm32/l1/stm32l-discovery/usart/Makefile | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/examples/Makefile.rules b/examples/Makefile.rules index 7c4a31c..3e0d308 100644 --- a/examples/Makefile.rules +++ b/examples/Makefile.rules @@ -41,7 +41,7 @@ LDSCRIPT ?= $(BINARY).ld OBJS += $(BINARY).o TOOLCHAIN_DIR ?= ../../../../../libopencm3 -ifeq ($(wildcard ../../../../../libopencm3/lib/lib$(LIBNAME).a),) +ifeq ($(wildcard $(TOOLCHAIN_DIR)/lib/lib$(LIBNAME).a),) ifneq ($(strip $(shell which $(CC))),) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) endif diff --git a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile index 373c5b2..9b5fde9 100644 --- a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile +++ b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile @@ -18,7 +18,7 @@ ## BINARY = adc-dac-printf -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/f1/stm32f100xb.ld +LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/f1/stm32f100xb.ld include ../../Makefile.include diff --git a/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/Makefile b/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/Makefile index 2516e59..e2b5060 100644 --- a/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/Makefile +++ b/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/Makefile @@ -18,7 +18,8 @@ ## BINARY = main -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld + +LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld include ../../Makefile.include diff --git a/examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile b/examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile index 2516e59..e2b5060 100644 --- a/examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile +++ b/examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile @@ -18,7 +18,8 @@ ## BINARY = main -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld + +LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld include ../../Makefile.include diff --git a/examples/stm32/l1/stm32l-discovery/miniblink/Makefile b/examples/stm32/l1/stm32l-discovery/miniblink/Makefile index 8e2ba0f..199baed 100644 --- a/examples/stm32/l1/stm32l-discovery/miniblink/Makefile +++ b/examples/stm32/l1/stm32l-discovery/miniblink/Makefile @@ -19,7 +19,7 @@ BINARY = miniblink -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld include ../../Makefile.include diff --git a/examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile b/examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile index 2ea5be0..6dd01e1 100644 --- a/examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile +++ b/examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile @@ -19,14 +19,15 @@ BINARY = usart-semihosting -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld # To disable, run "make ENABLE_SEMIHOSTING=0" or comment next line out ENABLE_SEMIHOSTING ?= 1 ifeq ($(ENABLE_SEMIHOSTING),1) -LDFLAGS += --specs=rdimon.specs -lrdimon -CFLAGS += -DENABLE_SEMIHOSTING=1 +LDFLAGS += --specs=rdimon.specs +LDLIBS += -lrdimon +DEFS += -DENABLE_SEMIHOSTING=1 endif include ../../Makefile.include diff --git a/examples/stm32/l1/stm32l-discovery/usart/Makefile b/examples/stm32/l1/stm32l-discovery/usart/Makefile index 85ebf1a..19aa3d4 100644 --- a/examples/stm32/l1/stm32l-discovery/usart/Makefile +++ b/examples/stm32/l1/stm32l-discovery/usart/Makefile @@ -19,7 +19,7 @@ BINARY = usart -LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld include ../../Makefile.include