riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/efm32: Fix 'cpu' module name conflict

Browse Source 
Rename 'cpu/efm32/families/efr32mg1p' module to 'cpu_efr32mg1p' to don't
conflict with 'cpu'.

Also required to set the path to vectors.o as its not provided by cpu.
This commit is contained in:
Gaëtan Harter 2018-01-29 15:21:31 +01:00
parent a3bc341878
commit f7046f83fb
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpu/efm32/Makefile.include
View File

@ -14,6 +14,12 @@ ifeq ($(CPU_ARCH),cortex-m0plus)
USEPKG += cmsis-dsp USEPKG += cmsis-dsp
endif endif
# include CPU family module
USEMODULE += cpu_$(EFM32_FAMILY)
# vectors.o is provided by 'cpu_$(EFM32_FAMILY)' and not by 'cpu'
VECTORS_O := $(BINDIR)/cpu_$(EFM32_FAMILY)/vectors.o
# include common periph module # include common periph module
USEMODULE += periph_common USEMODULE += periph_common

2
cpu/efm32/families/efr32mg1p/Makefile
View File

@ -1,4 +1,4 @@
MODULE = cpu MODULE = cpu_efr32mg1p
# (file triggers compiler bug. see #5775) # (file triggers compiler bug. see #5775)
SRC_NOLTO += vectors.c SRC_NOLTO += vectors.c