WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes for Cortex R5 self-update 

- load `f021_lookup_bank()` into RAM
 - `arch_reboot()` for TMS570
pull/168/head
Elms 2021-12-15 13:32:14 -08:00 committed by Daniele Lacamera
parent 777f25e31e
commit 78ace2ee17
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/ti_hercules.c
View File

@ -77,7 +77,7 @@ void hal_prepare_boot(void)
{ {
} }
static inline Fapi_FlashBankType f021_lookup_bank(uint32_t address) { static inline Fapi_FlashBankType RAMFUNCTION f021_lookup_bank(uint32_t address) {
Fapi_FlashBankType bank = Fapi_FlashBank0; Fapi_FlashBankType bank = Fapi_FlashBank0;
if (address >= 0x200000) { if (address >= 0x200000) {

17
src/boot_arm.c
View File

@ -500,15 +500,24 @@ void (* const IV[])(void) =
#ifdef RAM_CODE #ifdef RAM_CODE
#define AIRCR *(volatile uint32_t *)(0xE000ED0C) #ifdef CORTEX_R5
#define AIRCR_VKEY (0x05FA << 16) // Section 2.5.1.45 of spnu563A
#define AIRCR_SYSRESETREQ (1 << 2) # define SYSECR *((volatile uint32_t *)0xFFFFFFE0)
# define ECR_RESET (1 << 15)
#else
# define AIRCR *(volatile uint32_t *)(0xE000ED0C)
# define AIRCR_VKEY (0x05FA << 16)
# define AIRCR_SYSRESETREQ (1 << 2)
#endif
void RAMFUNCTION arch_reboot(void) void RAMFUNCTION arch_reboot(void)
{ {
#ifdef CORTEX_R5
SYSECR = ECR_RESET;
#else
AIRCR = AIRCR_SYSRESETREQ | AIRCR_VKEY; AIRCR = AIRCR_SYSRESETREQ | AIRCR_VKEY;
#endif
while(1) while(1)
; ;
} }
#endif /* RAM_CODE */ #endif /* RAM_CODE */