ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "NRF52: Fix vector table" 

This reverts commit 3d2fa535a71b7bad08c6a91a31d74f4492c8948c.

This was a breaking change for the "MBR" and "NONE" builds.
After testing it was also determined that copying the vector
table a second time wasn't required for the "FULL" build.
pull/10652/head
RFulchiero 2018-11-14 14:51:10 -06:00 committed by desmond.chen
parent 742d10fcc2
commit 2a968d4d35
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c
View File

@ -47,7 +47,15 @@
#include "nrf_dfu_mbr.h" #include "nrf_dfu_mbr.h"
#endif #endif
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
__attribute__ ((section(".bss.nvictable"),zero_init))
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS]; uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
#elif defined(__GNUC__)
__attribute__ ((section(".nvictable")))
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
#elif defined(__ICCARM__)
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS] @ ".nvictable";
#endif
extern uint32_t __Vectors[]; extern uint32_t __Vectors[];
@ -105,6 +113,7 @@ void nrf_reloc_vector_table(void)
#endif #endif
} }
#if (STDIO_UART_RTS != NC)
void mbed_sdk_init(void) void mbed_sdk_init(void)
{ {
if (STDIO_UART_RTS != NC) { if (STDIO_UART_RTS != NC) {
@ -114,3 +123,4 @@ void mbed_sdk_init(void)
gpio_write(&rts, 0); gpio_write(&rts, 0);
} }
} }
#endif