Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
6f5db1c9
Unverified
Commit
6f5db1c9
authored
6 years ago
by
Bas Stottelaar
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #9097 from basilfx/feature/efm32_cpp
cpu: efm32: fix for cpp support.
parents
fce61f91
283e5fb2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cpu/efm32/Makefile.features
+2
-1
2 additions, 1 deletion
cpu/efm32/Makefile.features
tests/unittests/Makefile
+4
-0
4 additions, 0 deletions
tests/unittests/Makefile
with
6 additions
and
1 deletion
cpu/efm32/Makefile.features
+
2
−
1
View file @
6f5db1c9
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
This diff is collapsed.
Click to expand it.
tests/unittests/Makefile
+
4
−
0
View file @
6f5db1c9
...
...
@@ -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
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment