ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'cy-mbed-os-5.12.0-ARM-compiler' of https://github.com/morser499/mbed-os into rollup

pull/10097/head
Martin Kojtal 2019-03-14 11:38:54 +00:00
parent 58e8916b32 2af3a82cd8
commit 9b1b54df39
5 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8C62XX/TARGET_MCU_PSOC6_M0/system_psoc6_cm0plus.c
View File

@ -193,13 +193,6 @@ void mailbox_init(void);
*******************************************************************************/ *******************************************************************************/
void SystemInit(void) void SystemInit(void)
{ {
/* Workaround to avoid twice SystemInit() call when ARMC5 compiler is used */
static uint32_t temp_var = 0;
if (temp_var == 0)
{
temp_var = 1;
Cy_PDL_Init(CY_DEVICE_CFG); Cy_PDL_Init(CY_DEVICE_CFG);
/* Restore FLL registers to the default state as they are not restored by the ROM code */ /* Restore FLL registers to the default state as they are not restored by the ROM code */
@ -299,8 +292,6 @@ void SystemInit(void)
#else/* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */ #else/* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
Cy_SemaIpcFlashInit(); Cy_SemaIpcFlashInit();
#endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */ #endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
}
} }

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8C62XX/device/system_psoc6.h
View File

@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions * \addtogroup group_system_config_system_functions
* \{ * \{
*/ */
#if defined(__ARMCC_VERSION) extern void SystemInit(void);
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemCoreClockUpdate(void); extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */ /** \} group_system_config_system_functions */

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_4343W/device/system_psoc6.h
View File

@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions * \addtogroup group_system_config_system_functions
* \{ * \{
*/ */
#if defined(__ARMCC_VERSION) extern void SystemInit(void);
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemCoreClockUpdate(void); extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */ /** \} group_system_config_system_functions */

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/system_psoc6.h
View File

@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions * \addtogroup group_system_config_system_functions
* \{ * \{
*/ */
#if defined(__ARMCC_VERSION) extern void SystemInit(void);
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemCoreClockUpdate(void); extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */ /** \} group_system_config_system_functions */

6
targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CMOD_062_4343W/device/system_psoc6.h
View File

@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions * \addtogroup group_system_config_system_functions
* \{ * \{
*/ */
#if defined(__ARMCC_VERSION) extern void SystemInit(void);
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemCoreClockUpdate(void); extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */ /** \} group_system_config_system_functions */