diff --git a/include/arch/arm/aarch32/cortex_m/scripts/linker.ld b/include/arch/arm/aarch32/cortex_m/scripts/linker.ld index 1aea06ee83a..a279b689780 100644 --- a/include/arch/arm/aarch32/cortex_m/scripts/linker.ld +++ b/include/arch/arm/aarch32/cortex_m/scripts/linker.ld @@ -398,7 +398,7 @@ GROUP_START(ITCM) } GROUP_LINK_IN(ITCM AT> ROMABLE_REGION) __itcm_size = __itcm_end - __itcm_start; - __itcm_rom_start = LOADADDR(_ITCM_SECTION_NAME); + __itcm_load_start = LOADADDR(_ITCM_SECTION_NAME); GROUP_END(ITCM) #endif @@ -433,7 +433,7 @@ GROUP_START(DTCM) __dtcm_end = .; - __dtcm_data_rom_start = LOADADDR(_DTCM_DATA_SECTION_NAME); + __dtcm_data_load_start = LOADADDR(_DTCM_DATA_SECTION_NAME); GROUP_END(DTCM) #endif diff --git a/include/linker/linker-defs.h b/include/linker/linker-defs.h index 89bb83e7131..715fb4e0dc6 100644 --- a/include/linker/linker-defs.h +++ b/include/linker/linker-defs.h @@ -291,7 +291,7 @@ extern char __ccm_end[]; extern char __itcm_start[]; extern char __itcm_end[]; extern char __itcm_size[]; -extern char __itcm_rom_start[]; +extern char __itcm_load_start[]; #endif #if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) @@ -301,7 +301,7 @@ extern char __dtcm_bss_start[]; extern char __dtcm_bss_end[]; extern char __dtcm_noinit_start[]; extern char __dtcm_noinit_end[]; -extern char __dtcm_data_rom_start[]; +extern char __dtcm_data_load_start[]; extern char __dtcm_start[]; extern char __dtcm_end[]; #endif diff --git a/kernel/xip.c b/kernel/xip.c index 2a2c89e9396..62d46785c60 100644 --- a/kernel/xip.c +++ b/kernel/xip.c @@ -36,11 +36,11 @@ void z_data_copy(void) __ccm_data_end - __ccm_data_start); #endif #if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_itcm), okay) - (void)memcpy(&__itcm_start, &__itcm_rom_start, + (void)memcpy(&__itcm_start, &__itcm_load_start, (uintptr_t) &__itcm_size); #endif #if DT_NODE_HAS_STATUS(DT_CHOSEN(zephyr_dtcm), okay) - (void)memcpy(&__dtcm_data_start, &__dtcm_data_rom_start, + (void)memcpy(&__dtcm_data_start, &__dtcm_data_load_start, __dtcm_data_end - __dtcm_data_start); #endif #ifdef CONFIG_CODE_DATA_RELOCATION