From 840de5139bdd30918c1575b173ef7461a9205867 Mon Sep 17 00:00:00 2001
From: Bas Stottelaar <basstottelaar@gmail.com>
Date: Mon, 7 May 2018 21:32:41 +0200
Subject: [PATCH 1/2] cpu: efm32: fix for cpp support.

---
 cpu/efm32/Makefile.features | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpu/efm32/Makefile.features b/cpu/efm32/Makefile.features
index 3fd4dfc3d7..22697274e6 100644
--- a/cpu/efm32/Makefile.features
+++ b/cpu/efm32/Makefile.features
@@ -1,6 +1,5 @@
 FEATURES_PROVIDED += periph_cpuid
 FEATURES_PROVIDED += periph_flashpage
-FEATURES_PROVIDED += periph_pm
 
 FEATURES_CONFLICT += periph_rtc:periph_rtt
 FEATURES_CONFLICT_MSG += "On the EFM32, the RTC and RTT map to the same hardware peripheral."
@@ -8,3 +7,5 @@ FEATURES_CONFLICT_MSG += "On the EFM32, the RTC and RTT map to the same hardware
 ifeq (1,$(EFM32_TNRG))
   FEATURES_PROVIDED += periph_hwrng
 endif
+
+include $(RIOTCPU)/cortexm_common/Makefile.features

From 283e5fb2c2123ec2677b21a12f020b30083dd4c5 Mon Sep 17 00:00:00 2001
From: Bas Stottelaar <basstottelaar@gmail.com>
Date: Mon, 14 May 2018 12:01:57 +0200
Subject: [PATCH 2/2] tests: unittests: blacklist efm32 boards with
 insufficient memory

---
 tests/unittests/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index f694955f8d..7ad1ee5b61 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -19,6 +19,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
                              chronos \
                              ek-lm4f120xl \
                              feather-m0 \
+                             ikea-tradfri \
                              limifrog-v1 maple-mini \
                              mbed_lpc1768 \
                              mega-xplained \
@@ -56,10 +57,13 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
                              samd21-xpro \
                              samr21-xpro \
                              seeeduino_arch-pro \
+                             slstk3401a \
+                             sltb001a \
                              slwstk6220a \
                              sodaq-autonomo \
                              sodaq-explorer \
                              spark-core \
+                             stk3600 \
                              stm32f0discovery \
                              stm32f3discovery \
                              teensy31 \