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

Merge pull request #9097 from basilfx/feature/efm32_cpp

Browse Source 
cpu: efm32: fix for cpp support.
This commit is contained in:
Bas Stottelaar 2018-05-25 21:09:49 +02:00 committed by GitHub
commit 6f5db1c954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/efm32/Makefile.features
View File

@ -1,6 +1,5 @@
FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_cpuid
FEATURES_PROVIDED += periph_flashpage FEATURES_PROVIDED += periph_flashpage
FEATURES_PROVIDED += periph_pm
FEATURES_CONFLICT += periph_rtc:periph_rtt FEATURES_CONFLICT += periph_rtc:periph_rtt
FEATURES_CONFLICT_MSG += "On the EFM32, the RTC and RTT map to the same hardware peripheral." 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)) ifeq (1,$(EFM32_TNRG))
FEATURES_PROVIDED += periph_hwrng FEATURES_PROVIDED += periph_hwrng
endif endif
include $(RIOTCPU)/cortexm_common/Makefile.features

4
tests/unittests/Makefile
View File

@ -19,6 +19,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
chronos \ chronos \
ek-lm4f120xl \ ek-lm4f120xl \
feather-m0 \ feather-m0 \
ikea-tradfri \
limifrog-v1 maple-mini \ limifrog-v1 maple-mini \
mbed_lpc1768 \ mbed_lpc1768 \
mega-xplained \ mega-xplained \
@ -56,10 +57,13 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
samd21-xpro \ samd21-xpro \
samr21-xpro \ samr21-xpro \
seeeduino_arch-pro \ seeeduino_arch-pro \
slstk3401a \
sltb001a \
slwstk6220a \ slwstk6220a \
sodaq-autonomo \ sodaq-autonomo \
sodaq-explorer \ sodaq-explorer \
spark-core \ spark-core \
stk3600 \
stm32f0discovery \ stm32f0discovery \
stm32f3discovery \ stm32f3discovery \
teensy31 \ teensy31 \