cpu/cortexm_common: use linker variable to initialize SCB->VTOR

Vincent Dupont · Vincent Dupont · commit f656a31e580f · 2017-03-17T18:07:22.000+01:00
diff --git a/cpu/cortexm_common/cortexm_init.c b/cpu/cortexm_common/cortexm_init.c
@@ -26,6 +26,11 @@
  */
 #define FULL_FPU_ACCESS         (0x00f00000)
 
+/**
+ * Interrupt vector base address, defined by the linker
+ */
+extern const void *_isr_vectors;
+
 void cortexm_init(void)
 {
     /* initialize the FPU on Cortex-M4F CPUs */
@@ -37,7 +42,7 @@ void cortexm_init(void)
     /* configure the vector table location to internal flash */
 #if defined(CPU_ARCH_CORTEX_M3) || defined(CPU_ARCH_CORTEX_M4) || \
     defined(CPU_ARCH_CORTEX_M4F)
-    SCB->VTOR = CPU_FLASH_BASE;
+    SCB->VTOR = (uint32_t)&_isr_vectors;
 #endif
 
     /* initialize the interrupt priorities */
diff --git a/cpu/cortexm_common/ldscripts/cortexm_base.ld b/cpu/cortexm_common/ldscripts/cortexm_base.ld
@@ -41,6 +41,7 @@ SECTIONS
     {
         . = ALIGN(4);
         _sfixed = .;
+        _isr_vectors = DEFINED(_isr_vectors) ? _isr_vectors : . ;
         KEEP(*(.vectors .vectors.*))
         *(.text .text.* .gnu.linkonce.t.*)
         *(.glue_7t) *(.glue_7)
diff --git a/cpu/kinetis_common/ldscripts/kinetis.ld b/cpu/kinetis_common/ldscripts/kinetis.ld
@@ -25,7 +25,7 @@ SECTIONS
     /* Interrupt vectors 0x00-0x3ff. */
     .vector_table :
     {
-        _vector_rom = .;
+        _isr_vectors = .;
         KEEP(*(.vector_table))
     } > vectors
     ASSERT (SIZEOF(.vector_table) == 0x400, "Interrupt vector table of invalid size.")

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ SECTIONS`
`41`	`41`	`{`
`42`	`42`	`. = ALIGN(4);`
`43`	`43`	`_sfixed = .;`
	`44`	`+ _isr_vectors = DEFINED(_isr_vectors) ? _isr_vectors : . ;`
`44`	`45`	`KEEP((.vectors .vectors.))`
`45`	`46`	`(.text .text. .gnu.linkonce.t.*)`
`46`	`47`	`(.glue_7t) (.glue_7)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ SECTIONS`
`25`	`25`	`/* Interrupt vectors 0x00-0x3ff. */`
`26`	`26`	`.vector_table :`
`27`	`27`	`{`
`28`		`- _vector_rom = .;`
	`28`	`+ _isr_vectors = .;`
`29`	`29`	`KEEP(*(.vector_table))`
`30`	`30`	`} > vectors`
`31`	`31`	`ASSERT (SIZEOF(.vector_table) == 0x400, "Interrupt vector table of invalid size.")`