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
e2ab6cf8
Unverified
Commit
e2ab6cf8
authored
6 years ago
by
Francisco Acosta
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #9472 from gebart/pr/kinetis-mcg-conditional
kinetis: Conditionally enable MCG
parents
7a264b2a
172af17a
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/kinetis/Makefile.features
+1
-0
1 addition, 0 deletions
cpu/kinetis/Makefile.features
cpu/kinetis/cpu.c
+4
-0
4 additions, 0 deletions
cpu/kinetis/cpu.c
with
5 additions
and
0 deletions
cpu/kinetis/Makefile.features
+
1
−
0
View file @
e2ab6cf8
FEATURES_PROVIDED
+=
periph_cpuid
FEATURES_PROVIDED
+=
periph_hwrng
FEATURES_PROVIDED
+=
periph_gpio
FEATURES_PROVIDED
+=
periph_mcg
include
$(RIOTCPU)/cortexm_common/Makefile.features
This diff is collapsed.
Click to expand it.
cpu/kinetis/cpu.c
+
4
−
0
View file @
e2ab6cf8
...
...
@@ -19,7 +19,9 @@
#include
"cpu.h"
#include
"periph/init.h"
#ifdef MODULE_PERIPH_MCG
#include
"mcg.h"
#endif
/**
* @brief Initialize the CPU, set IRQ priorities
...
...
@@ -33,8 +35,10 @@ void cpu_init(void)
/* Note: This register can only be written once after each reset, so we must
* enable all power modes that we wish to use. */
SMC
->
PMPROT
|=
SMC_PMPROT_ALLS_MASK
|
SMC_PMPROT_AVLP_MASK
;
#ifdef MODULE_PERIPH_MCG
/* initialize the CPU clocking provided by the MCG module */
kinetis_mcg_init
();
#endif
/* trigger static peripheral initialization */
periph_init
();
}
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