mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #4482 from kegilbert/bugfix/efm32-bootloader-s1-rebase
[Silicon Labs] Bugfix for bootloader on Pearl and Mighty Gecko - Rebasepull/4478/head^2
commit
8a6f28dd52
|
@ -211,5 +211,5 @@ SECTIONS
|
||||||
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
||||||
|
|
||||||
/* Check if FLASH usage exceeds FLASH size */
|
/* Check if FLASH usage exceeds FLASH size */
|
||||||
ASSERT( LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
ASSERT(ORIGIN(FLASH) + LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,5 +211,5 @@ SECTIONS
|
||||||
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
||||||
|
|
||||||
/* Check if FLASH usage exceeds FLASH size */
|
/* Check if FLASH usage exceeds FLASH size */
|
||||||
ASSERT( LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
ASSERT(ORIGIN(FLASH) + LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,5 +211,5 @@ SECTIONS
|
||||||
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
||||||
|
|
||||||
/* Check if FLASH usage exceeds FLASH size */
|
/* Check if FLASH usage exceeds FLASH size */
|
||||||
ASSERT( LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
ASSERT( ORIGIN(FLASH) + LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,5 +211,5 @@ SECTIONS
|
||||||
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
|
||||||
|
|
||||||
/* Check if FLASH usage exceeds FLASH size */
|
/* Check if FLASH usage exceeds FLASH size */
|
||||||
ASSERT( LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
ASSERT(ORIGIN(FLASH) + LENGTH(FLASH) >= (__etext + SIZEOF(.data)), "FLASH memory overflowed !")
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,19 +38,20 @@ void mbed_sdk_init()
|
||||||
{
|
{
|
||||||
CHIP_Init();
|
CHIP_Init();
|
||||||
|
|
||||||
#if defined(_SILICON_LABS_32B_PLATFORM_2)
|
#if defined(_SILICON_LABS_32B_SERIES_1)
|
||||||
EMU_DCDCInit_TypeDef dcdcInit = EMU_DCDCINIT_DEFAULT;
|
EMU_DCDCInit_TypeDef dcdcInit = EMU_DCDCINIT_DEFAULT;
|
||||||
EMU_DCDCInit(&dcdcInit);
|
EMU_DCDCInit(&dcdcInit);
|
||||||
|
|
||||||
|
#if (CORE_CLOCK_SOURCE == HFXO)
|
||||||
|
// Only init HFXO if not already done (e.g. by bootloader)
|
||||||
|
if (CMU_ClockSelectGet(cmuClock_HF) != cmuSelect_HFXO) {
|
||||||
#if defined(_EFR_DEVICE)
|
#if defined(_EFR_DEVICE)
|
||||||
CMU_HFXOInit_TypeDef hfxoInit = CMU_HFXOINIT_WSTK_DEFAULT;
|
CMU_HFXOInit_TypeDef hfxoInit = CMU_HFXOINIT_WSTK_DEFAULT;
|
||||||
// Initialize the HFXO using the settings from the WSTK bspconfig.h
|
|
||||||
// Note: This configures things like the capacitive tuning CTUNE variable
|
|
||||||
// which can vary based on your hardware design.
|
|
||||||
CMU_HFXOInit(&hfxoInit);
|
|
||||||
#else
|
#else
|
||||||
CMU_HFXOInit_TypeDef hfxoInit = CMU_HFXOINIT_STK_DEFAULT;
|
CMU_HFXOInit_TypeDef hfxoInit = CMU_HFXOINIT_STK_DEFAULT;
|
||||||
CMU_HFXOInit(&hfxoInit);
|
#endif
|
||||||
|
CMU_HFXOInit(&hfxoInit);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue