commit 505c6e6ac493555483cd50056c1ed051975729c1
author Rafał Kuźnia <rafal.kuznia@nordicsemi.no> Fri Jul 17 13:18:15 2020 +0200
committer Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no> Thu Jul 23 10:21:26 2020 +0200
tree 152643b8a4d0e26492ccd3fa303f76b067fdab03
parent a25c94155c28940f4e56e8472a51d1241f9d4cf1

boot/zephyr: set VTOR to relay vector before chain-load

If software IRQ relay is enabled and VTOR is available,
the bootloader will switch from its real vector table
to the relay vector table before chain-loading to the
application.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
Signed-off-by: Krzysztof Taborowski <krzysztof.taborowski@nordicsemi.no>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index 2b246ce..4050f4c 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -22,6 +22,7 @@
 #include <drivers/timer/system_timer.h>
 #include <usb/usb_device.h>
 #include <soc.h>
+#include <linker/linker-defs.h>
 
 #include "target.h"
 
@@ -99,17 +100,10 @@
 
 #if defined(CONFIG_ARM)
 
-#ifdef CONFIG_BOOT_INTR_VEC_RELOC
-
 #ifdef CONFIG_SW_VECTOR_RELAY
 extern void *_vector_table_pointer;
-#define VTOR _vector_table_pointer
-#elif CONFIG_CPU_CORTEX_M_HAS_VTOR
-#define VTOR SCB->VTOR
 #endif
 
-#endif /* CONFIG_BOOT_INTR_VEC_RELOC */
-
 struct arm_vector_table {
     uint32_t msp;
     uint32_t reset;
@@ -147,8 +141,20 @@
 #endif
 
 #ifdef CONFIG_BOOT_INTR_VEC_RELOC
-    VTOR = vt;
+#if defined(CONFIG_SW_VECTOR_RELAY)
+    _vector_table_pointer = vt;
+#ifdef CONFIG_CPU_CORTEX_M_HAS_VTOR
+    SCB->VTOR = (uint32_t)__vector_relay_table;
 #endif
+#elif defined(CONFIG_CPU_CORTEX_M_HAS_VTOR)
+    SCB->VTOR = (uint32_t)vt;
+#endif /* CONFIG_SW_VECTOR_RELAY */
+#else /* CONFIG_BOOT_INTR_VEC_RELOC */
+#if defined(CONFIG_CPU_CORTEX_M_HAS_VTOR) && defined(CONFIG_SW_VECTOR_RELAY)
+    _vector_table_pointer = _vector_start;
+    SCB->VTOR = (uint32_t)__vector_relay_table;
+#endif
+#endif /* CONFIG_BOOT_INTR_VEC_RELOC */
 
     __set_MSP(vt->msp);
 #if CONFIG_MCUBOOT_CLEANUP_ARM_CORE