EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the STM32 Makefile.includes usable from outside the examples tree (Issue #28)

Browse Source
This commit is contained in:
Frantisek Burian
2014-01-06 22:11:32 +01:00
parent 9934e40fe9
commit 02c35eee70
7 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Makefile.rules
View File

@@ -41,7 +41,7 @@ LDSCRIPT ?= $(BINARY).ld
OBJS += $(BINARY).o OBJS += $(BINARY).o
TOOLCHAIN_DIR ?= ../../../../../libopencm3 TOOLCHAIN_DIR ?= ../../../../../libopencm3
ifeq ($(wildcard ../../../../../libopencm3/lib/lib$(LIBNAME).a),) ifeq ($(wildcard $(TOOLCHAIN_DIR)/lib/lib$(LIBNAME).a),)
ifneq ($(strip $(shell which $(CC))),) ifneq ($(strip $(shell which $(CC))),)
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
endif endif

2
examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile
View File

@@ -18,7 +18,7 @@
## ##
BINARY = adc-dac-printf BINARY = adc-dac-printf
LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/f1/stm32f100xb.ld LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/f1/stm32f100xb.ld
include ../../Makefile.include include ../../Makefile.include

3
examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/Makefile
View File

@@ -18,7 +18,8 @@
## ##
BINARY = main BINARY = main
LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld
LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld
include ../../Makefile.include include ../../Makefile.include

3
examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile
View File

@@ -18,7 +18,8 @@
## ##
BINARY = main BINARY = main
LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld
LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld
include ../../Makefile.include include ../../Makefile.include

2
examples/stm32/l1/stm32l-discovery/miniblink/Makefile
View File

@@ -19,7 +19,7 @@
BINARY = miniblink BINARY = miniblink
LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld
include ../../Makefile.include include ../../Makefile.include

7
examples/stm32/l1/stm32l-discovery/usart-semihosting/Makefile
View File

@@ -19,14 +19,15 @@
BINARY = usart-semihosting 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 # To disable, run "make ENABLE_SEMIHOSTING=0" or comment next line out
ENABLE_SEMIHOSTING ?= 1 ENABLE_SEMIHOSTING ?= 1
ifeq ($(ENABLE_SEMIHOSTING),1) ifeq ($(ENABLE_SEMIHOSTING),1)
LDFLAGS += --specs=rdimon.specs -lrdimon LDFLAGS += --specs=rdimon.specs
CFLAGS += -DENABLE_SEMIHOSTING=1 LDLIBS += -lrdimon
DEFS += -DENABLE_SEMIHOSTING=1
endif endif
include ../../Makefile.include include ../../Makefile.include

2
examples/stm32/l1/stm32l-discovery/usart/Makefile
View File

@@ -19,7 +19,7 @@
BINARY = usart BINARY = usart
LDSCRIPT = $(TOOLCHAIN_DIR)/lib/stm32/l1/stm32l15xxb.ld LDSCRIPT = $(OPENCM3_DIR)/lib/stm32/l1/stm32l15xxb.ld
include ../../Makefile.include include ../../Makefile.include