devices: MCXxxx: 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: Neil Chen <cheng.chen_1@nxp.com>
nxp-upstream · Aug 5, 2024 · 8554591 · 8554591
1 parent 9f9de73
commit 8554591
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 29 deletions.
diff --git a/mcux/mcux-sdk/devices/MCXA156/system_MCXA156.c b/mcux/mcux-sdk/devices/MCXA156/system_MCXA156.c
@@ -75,13 +75,6 @@ __attribute__ ((weak)) void SystemInit (void) {
 
   SCB->NSACR |= ((3UL << 0) | (3UL << 10));   /* enable CP0, CP1, CP10, CP11 Non-secure Access */
 
-#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 LPCAC */
     SYSCON->LPCAC_CTRL |= SYSCON_LPCAC_CTRL_LPCAC_MEM_REQ_MASK;
     SYSCON->LPCAC_CTRL &= ~SYSCON_LPCAC_CTRL_DIS_LPCAC_MASK;

diff --git a/mcux/mcux-sdk/devices/MCXN236/system_MCXN236.c b/mcux/mcux-sdk/devices/MCXN236/system_MCXN236.c
@@ -80,14 +80,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;
 

diff --git a/mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core0.c b/mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core0.c
@@ -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;
 

diff --git a/mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core1.c b/mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core1.c
@@ -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;