Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow overriding of DCDC settings per target #5855

Merged
merged 1 commit into from Jan 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -54,4 +54,9 @@
cmuOscMode_Crystal, \
}
#endif

/* DCDC settings */
#if !defined(EMU_DCDCINIT_STK_DEFAULT)
#define EMU_DCDCINIT_STK_DEFAULT EMU_DCDCINIT_DEFAULT
#endif
#endif
Expand Up @@ -54,4 +54,9 @@
cmuOscMode_Crystal, \
}
#endif

/* DCDC settings */
#if !defined(EMU_DCDCINIT_STK_DEFAULT)
#define EMU_DCDCINIT_STK_DEFAULT EMU_DCDCINIT_DEFAULT
#endif
#endif
Expand Up @@ -54,4 +54,9 @@
cmuOscMode_Crystal, \
}
#endif

/* DCDC settings */
#if !defined(EMU_DCDCINIT_STK_DEFAULT)
#define EMU_DCDCINIT_STK_DEFAULT EMU_DCDCINIT_DEFAULT
#endif
#endif
Expand Up @@ -54,4 +54,9 @@
cmuOscMode_Crystal, \
}
#endif

/* DCDC settings */
#if !defined(EMU_DCDCINIT_STK_DEFAULT)
#define EMU_DCDCINIT_STK_DEFAULT EMU_DCDCINIT_DEFAULT
#endif
#endif
Expand Up @@ -54,4 +54,9 @@
cmuOscMode_Crystal, \
}
#endif

/* DCDC settings */
#if !defined(EMU_DCDCINIT_STK_DEFAULT)
#define EMU_DCDCINIT_STK_DEFAULT EMU_DCDCINIT_DEFAULT
#endif
#endif
Expand Up @@ -39,9 +39,13 @@ void mbed_sdk_init()
CHIP_Init();

#if defined(_SILICON_LABS_32B_SERIES_1)
EMU_DCDCInit_TypeDef dcdcInit = EMU_DCDCINIT_DEFAULT;
#if defined(EMU_NO_DCDC)
EMU_DCDCPowerOff();
#else
EMU_DCDCInit_TypeDef dcdcInit = EMU_DCDCINIT_STK_DEFAULT;
EMU_DCDCInit(&dcdcInit);

#endif

#if (CORE_CLOCK_SOURCE == HFXO)
// Only init HFXO if not already done (e.g. by bootloader)
if (CMU_ClockSelectGet(cmuClock_HF) != cmuSelect_HFXO) {
Expand Down