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

Makefile.include: don't override DEFS

Browse Source 
Allow examples (such as usart-semihosting) to set DEFS for their own use,
and _then_ add the target definitions.
This commit is contained in:
Andrew Chen
2015-12-07 12:15:33 +13:00
committed by Karl Palsson
parent 070e5bbb94
commit 2314635cf0
13 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/lpc/lpc13xx/Makefile.include
View File

@@ -19,7 +19,7 @@
## ##
LIBNAME = opencm3_lpc13xx LIBNAME = opencm3_lpc13xx
DEFS = -DLPC13XX DEFS += -DLPC13XX
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd

2
examples/lpc/lpc17xx/Makefile.include
View File

@@ -20,7 +20,7 @@
LIBNAME = opencm3_lpc17xx LIBNAME = opencm3_lpc17xx
DEFS = -DLPC17XX DEFS += -DLPC17XX
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd

2
examples/lpc/lpc43xx/Makefile.include
View File

@@ -22,7 +22,7 @@
LIBNAME = opencm3_lpc43xx LIBNAME = opencm3_lpc43xx
DEFS = -DLPC43XX DEFS += -DLPC43XX
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)

2
examples/stm32/f0/Makefile.include
View File

@@ -19,7 +19,7 @@
## ##
LIBNAME = opencm3_stm32f0 LIBNAME = opencm3_stm32f0
DEFS = -DSTM32F0 DEFS += -DSTM32F0
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m0 $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m0 $(FP_FLAGS)

2
examples/stm32/f1/Makefile.include
View File

@@ -19,7 +19,7 @@
## ##
LIBNAME = opencm3_stm32f1 LIBNAME = opencm3_stm32f1
DEFS = -DSTM32F1 DEFS += -DSTM32F1
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd

2
examples/stm32/f2/Makefile.include
View File

@@ -20,7 +20,7 @@
## ##
LIBNAME = opencm3_stm32f2 LIBNAME = opencm3_stm32f2
DEFS = -DSTM32F2 DEFS += -DSTM32F2
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd

2
examples/stm32/f3/Makefile.include
View File

@@ -20,7 +20,7 @@
## ##
LIBNAME = opencm3_stm32f3 LIBNAME = opencm3_stm32f3
DEFS = -DSTM32F3 DEFS += -DSTM32F3
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)

2
examples/stm32/f4/Makefile.include
View File

@@ -20,7 +20,7 @@
## ##
LIBNAME = opencm3_stm32f4 LIBNAME = opencm3_stm32f4
DEFS = -DSTM32F4 DEFS += -DSTM32F4
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)

2
examples/stm32/l0/Makefile.include
View File

@@ -19,7 +19,7 @@
## ##
LIBNAME = opencm3_stm32l0 LIBNAME = opencm3_stm32l0
DEFS = -DSTM32L0 DEFS += -DSTM32L0
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m0plus $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m0plus $(FP_FLAGS)

2
examples/stm32/l1/Makefile.include
View File

@@ -19,7 +19,7 @@
## ##
LIBNAME = opencm3_stm32l1 LIBNAME = opencm3_stm32l1
DEFS = -DSTM32L1 DEFS += -DSTM32L1
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) -mfix-cortex-m3-ldrd

2
examples/tiva/lm3s/Makefile.include
View File

@@ -19,7 +19,7 @@
## ##
LIBNAME = opencm3_lm3s LIBNAME = opencm3_lm3s
DEFS = -DLM3S DEFS += -DLM3S
FP_FLAGS ?= -msoft-float FP_FLAGS ?= -msoft-float
ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m3 $(FP_FLAGS)

2
examples/tiva/lm4f/Makefile.include
View File

@@ -20,7 +20,7 @@
## ##
LIBNAME = opencm3_lm4f LIBNAME = opencm3_lm4f
DEFS = -DLM4F DEFS += -DLM4F
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)

2
examples/vf6xx/colibri-vf61/Makefile.include
View File

@@ -21,7 +21,7 @@
## ##
LIBNAME = opencm3_vf6xx LIBNAME = opencm3_vf6xx
DEFS = -DVF6XX DEFS += -DVF6XX
FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS)