From f7046f83fb1cc50666909e36bdcb09cb73542c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Mon, 29 Jan 2018 15:21:31 +0100
Subject: [PATCH] cpu/efm32: Fix 'cpu' module name conflict

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.
---
 cpu/efm32/Makefile.include            | 6 ++++++
 cpu/efm32/families/efr32mg1p/Makefile | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cpu/efm32/Makefile.include b/cpu/efm32/Makefile.include
index d27dc50a2e..de69fa6fb7 100644
--- a/cpu/efm32/Makefile.include
+++ b/cpu/efm32/Makefile.include
@@ -14,6 +14,12 @@ ifeq ($(CPU_ARCH),cortex-m0plus)
   USEPKG += cmsis-dsp
 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
 USEMODULE += periph_common
 
diff --git a/cpu/efm32/families/efr32mg1p/Makefile b/cpu/efm32/families/efr32mg1p/Makefile
index adfea32360..3535a04956 100644
--- a/cpu/efm32/families/efr32mg1p/Makefile
+++ b/cpu/efm32/families/efr32mg1p/Makefile
@@ -1,4 +1,4 @@
-MODULE = cpu
+MODULE = cpu_efr32mg1p
 
 # (file triggers compiler bug. see #5775)
 SRC_NOLTO += vectors.c