From f8807dae89cf9ef47dfd8de67fd7e149c06b734b Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Thu, 29 Oct 2015 13:59:07 -0400 Subject: [PATCH] arm: rename _VectorTableROM For non-XIP systems, it's not in ROM, so remove the "ROM" part. Adapt it to coding conventions at the same time, and export it to C code. Change-Id: Id09a6be8bc9c462667ed71b53be7fa5382c88db3 Signed-off-by: Benjamin Walsh --- arch/arm/core/cortex_m/vector_table.S | 6 +++--- arch/arm/core/cortex_m/vector_table.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/core/cortex_m/vector_table.S b/arch/arm/core/cortex_m/vector_table.S index 532bf978a71..e0e11a07c8f 100644 --- a/arch/arm/core/cortex_m/vector_table.S +++ b/arch/arm/core/cortex_m/vector_table.S @@ -18,8 +18,8 @@ * @file * @brief Populated vector table in ROM * - * Vector table in ROM for starting system. The reset vector is the system entry - * point, ie. the first instruction executed. + * Vector table at the beginning of the image for starting system. The reset + * vector is the system entry point, ie. the first instruction executed. * * The table is populated with all the system exception handlers. The NMI vector * must be populated with a valid handler since it can happen at any time. The @@ -36,7 +36,7 @@ _ASM_FILE_PROLOGUE SECTION_SUBSEC_FUNC(exc_vector_table,_Start,__start) -SECTION_SUBSEC_FUNC(exc_vector_table,_Start,_VectorTableROM) +SECTION_SUBSEC_FUNC(exc_vector_table,_Start,_vector_table) .word __CORTEXM_BOOT_MSP .word __reset diff --git a/arch/arm/core/cortex_m/vector_table.h b/arch/arm/core/cortex_m/vector_table.h index bf1673c66ac..3199868dbea 100644 --- a/arch/arm/core/cortex_m/vector_table.h +++ b/arch/arm/core/cortex_m/vector_table.h @@ -47,7 +47,7 @@ extern "C" { .equ __CORTEXM_BOOT_PSP, (__CORTEXM_BOOT_MSP - 0x100) GTEXT(__start) -GTEXT(_VectorTableROM) +GTEXT(_vector_table) GTEXT(__reset) GTEXT(__nmi) @@ -63,6 +63,10 @@ GTEXT(__reserved) GTEXT(_PrepC) GTEXT(_isr_wrapper) +#else + +extern void *_vector_table[]; + #endif /* _ASMLANGUAGE */ #ifdef __cplusplus