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.

Sign up for GitHub

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

Jump to bottom

Removed PSoC6 SystemInit Workaround for ARM compiler #10073

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Removed PSoC6 SystemInit Workaround for ARM compiler #10073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ...ts/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8C62XX/TARGET_MCU_PSOC6_M0/system_psoc6_cm0plus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,6 @@ void mailbox_init(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);

/* Restore FLL registers to the default state as they are not restored by the ROM code */
Expand Down Expand Up @@ -299,8 +292,6 @@ void SystemInit(void)
#else/* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */
Cy_SemaIpcFlashInit();
#endif /* !defined(CY_IPC_DEFAULT_CFG_DISABLE) */

}
}


Expand Down
6 changes: 1 addition & 5 deletions targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8C62XX/device/system_psoc6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions
* \{
*/
#if defined(__ARMCC_VERSION)
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemInit(void);

extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */
Expand Down
6 changes: 1 addition & 5 deletions targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_4343W/device/system_psoc6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions
* \{
*/
#if defined(__ARMCC_VERSION)
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemInit(void);

extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */
Expand Down
6 changes: 1 addition & 5 deletions targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/system_psoc6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions
* \{
*/
#if defined(__ARMCC_VERSION)
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemInit(void);

extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */
Expand Down
6 changes: 1 addition & 5 deletions targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CMOD_062_4343W/device/system_psoc6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,7 @@ extern "C" {
* \addtogroup group_system_config_system_functions
* \{
*/
#if defined(__ARMCC_VERSION)
extern void SystemInit(void) __attribute__((constructor));
#else
extern void SystemInit(void);
#endif /* (__ARMCC_VERSION) */
extern void SystemInit(void);

extern void SystemCoreClockUpdate(void);
/** \} group_system_config_system_functions */
Expand Down