Skip to content

Commit 3c4f74b

Browse files
mmahadevan108decsny
authored andcommitted
devices: MCXN947: Update system file to remove SDK sepecific defines
__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]>
1 parent 6e91ed8 commit 3c4f74b

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

mcux/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,4 @@ Patch List:
6969
- mcux-sdk\manifests
7070
- mcux-sdk\docs
7171
4. Add RW61X device_system.cmake
72+
5. devices: MCXN947: Update system file to remove SDK sepecific defines

mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core0.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,6 @@ __attribute__ ((weak)) void SystemInit (void) {
8383

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

86-
#if defined(__MCUXPRESSO)
87-
extern void(*const g_pfnVectors[]) (void);
88-
SCB->VTOR = (uint32_t) &g_pfnVectors;
89-
#else
90-
extern void *__Vectors;
91-
SCB->VTOR = (uint32_t) &__Vectors;
92-
#endif
9386
/* enable the flash cache LPCAC */
9487
SYSCON->LPCAC_CTRL &= ~SYSCON_LPCAC_CTRL_DIS_LPCAC_MASK;
9588

mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core1.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,6 @@ __attribute__ ((weak)) void SystemInit (void) {
7777

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

80-
#if defined(__MCUXPRESSO)
81-
extern void(*const g_pfnVectors[]) (void);
82-
SCB->VTOR = (uint32_t) &g_pfnVectors;
83-
#else
84-
extern void *__Vectors;
85-
SCB->VTOR = (uint32_t) &__Vectors;
86-
#endif
8780
/* enable the flash cache LPCAC */
8881
SYSCON->LPCAC_CTRL &= ~SYSCON_LPCAC_CTRL_DIS_LPCAC_MASK;
8982

0 commit comments

Comments
 (0)