From cc800be89a87b5cca4d653758753b6c049a87b0e Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 3 Jan 2014 21:54:34 +0000 Subject: [PATCH] linker script paths: don't hardcode the path While some of the examples include a "board.ld" style file, some of them were pointing to the libopencm3 provided chip specific ld scripts. When TOOLCHAIN_DIR has been overridden, those paths were no longer valid/correct. --- examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile | 2 +- .../l1/stm32l-discovery/button-irq-printf-lowpower/Makefile | 2 +- examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile | 2 +- examples/stm32/l1/stm32l-discovery/miniblink/Makefile | 2 +- examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile | 2 +- examples/stm32/l1/stm32l-discovery/usart/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile index de6ca6b..373c5b2 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 = ../../../../../libopencm3/lib/stm32/f1/stm32f100xb.ld +LDSCRIPT = $(TOOLCHAIN_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 a9b9f28..2516e59 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,7 @@ ## BINARY = main -LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(TOOLCHAIN_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 a9b9f28..2516e59 100644 --- a/examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile +++ b/examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile @@ -18,7 +18,7 @@ ## BINARY = main -LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(TOOLCHAIN_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 37b0dde..8e2ba0f 100644 --- a/examples/stm32/l1/stm32l-discovery/miniblink/Makefile +++ b/examples/stm32/l1/stm32l-discovery/miniblink/Makefile @@ -19,7 +19,7 @@ BINARY = miniblink -LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(TOOLCHAIN_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 51e1a41..2ea5be0 100644 --- a/examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile +++ b/examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile @@ -19,7 +19,7 @@ BINARY = usart-semihosting -LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld # To disable, run "make ENABLE_SEMIHOSTING=0" or comment next line out ENABLE_SEMIHOSTING ?= 1 diff --git a/examples/stm32/l1/stm32l-discovery/usart/Makefile b/examples/stm32/l1/stm32l-discovery/usart/Makefile index a849132..85ebf1a 100644 --- a/examples/stm32/l1/stm32l-discovery/usart/Makefile +++ b/examples/stm32/l1/stm32l-discovery/usart/Makefile @@ -19,7 +19,7 @@ BINARY = usart -LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld +LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld include ../../Makefile.include