Skip to content

Commit

Permalink
devices: MCXN947: Update system file to remove SDK sepecific defines
Browse files Browse the repository at this point in the history
__Vectors is not defined in non-SDK projects such as Zephyr which like
to call SystemInit function. This causes build failures as a result.

Signed-off-by: Mahesh Mahadevan <[email protected]>
  • Loading branch information
mmahadevan108 authored and decsny committed Mar 13, 2024
1 parent 6e91ed8 commit 3c4f74b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
1 change: 1 addition & 0 deletions mcux/README
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ Patch List:
- mcux-sdk\manifests
- mcux-sdk\docs
4. Add RW61X device_system.cmake
5. devices: MCXN947: Update system file to remove SDK sepecific defines
7 changes: 0 additions & 7 deletions mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core0.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,6 @@ __attribute__ ((weak)) void SystemInit (void) {

SYSCON->NVM_CTRL &= ~SYSCON_NVM_CTRL_DIS_MBECC_ERR_DATA_MASK; /* enables bus error on multi-bit ECC error for data */

#if defined(__MCUXPRESSO)
extern void(*const g_pfnVectors[]) (void);
SCB->VTOR = (uint32_t) &g_pfnVectors;
#else
extern void *__Vectors;
SCB->VTOR = (uint32_t) &__Vectors;
#endif
/* enable the flash cache LPCAC */
SYSCON->LPCAC_CTRL &= ~SYSCON_LPCAC_CTRL_DIS_LPCAC_MASK;

Expand Down
7 changes: 0 additions & 7 deletions mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core1.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@ __attribute__ ((weak)) void SystemInit (void) {

SYSCON->NVM_CTRL &= ~SYSCON_NVM_CTRL_DIS_MBECC_ERR_DATA_MASK; /* enables bus error on multi-bit ECC error for data */

#if defined(__MCUXPRESSO)
extern void(*const g_pfnVectors[]) (void);
SCB->VTOR = (uint32_t) &g_pfnVectors;
#else
extern void *__Vectors;
SCB->VTOR = (uint32_t) &__Vectors;
#endif
/* enable the flash cache LPCAC */
SYSCON->LPCAC_CTRL &= ~SYSCON_LPCAC_CTRL_DIS_LPCAC_MASK;

Expand Down

0 comments on commit 3c4f74b

Please sign in to comment.