michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: cortex_m: Include TBLBASE in VTOR mask if present

Browse source 
In some Cortex-M3 implementations SCB_VTOR bit[29] is called
the TBLBASE bit.
This enables setting VTOR to an SRAM address for qemu_cortex_m3

Signed-off-by: Grant Ramsay <gramsay@enphaseenergy.com>
This commit is contained in:
Grant Ramsay 2024-10-15 10:23:45 +13:00 • committed by David Leach
commit 31b54e7cee
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/core/cortex_m/prep_c.c
View file

@ -45,9 +45,16 @@ void *_vector_table_pointer;
#define VECTOR_ADDRESS ((uintptr_t)_vector_start) #define VECTOR_ADDRESS ((uintptr_t)_vector_start)
/* In some Cortex-M3 implementations SCB_VTOR bit[29] is called the TBLBASE bit */
#ifdef SCB_VTOR_TBLBASE_Msk
#define VTOR_MASK (SCB_VTOR_TBLBASE_Msk | SCB_VTOR_TBLOFF_Msk)
#else
#define VTOR_MASK SCB_VTOR_TBLOFF_Msk
#endif
static inline void relocate_vector_table(void) static inline void relocate_vector_table(void)
{ {
SCB->VTOR = VECTOR_ADDRESS & SCB_VTOR_TBLOFF_Msk; SCB->VTOR = VECTOR_ADDRESS & VTOR_MASK;
barrier_dsync_fence_full(); barrier_dsync_fence_full();
barrier_isync_fence_full(); barrier_isync_fence_full();
} }