From 3c4f74b405ca174fe3eb5f3b74c355376ee9a69f Mon Sep 17 00:00:00 2001 From: Mahesh Mahadevan Date: Mon, 11 Mar 2024 12:18:55 -0500 Subject: [PATCH] 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 --- mcux/README | 1 + mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core0.c | 7 ------- mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core1.c | 7 ------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/mcux/README b/mcux/README index f554702b341aa3..bb20710a670faf 100644 --- a/mcux/README +++ b/mcux/README @@ -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 diff --git a/mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core0.c b/mcux/mcux-sdk/devices/MCXN947/system_MCXN947_cm33_core0.c index 9a52dd2771367b..cdf2318fcc8764 100644 --- 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 index ff9f3ae73d12e0..9af06585a580a3 100644 --- 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;