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

Reverted 'return -1' fix; removed _update() optim.

pull/183/head
Daniele Lacamera 2022-03-14 18:14:50 +01:00
parent a72715caa3
commit 0665eeff67
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/image.h
View File

@ -42,6 +42,8 @@
#endif #endif
#endif #endif
#define likely(x) __builtin_expect((x),1)
#define unlikely(x) __builtin_expect((x),0)
#define NAKED __attribute__((naked)) #define NAKED __attribute__((naked))
@ -220,20 +222,16 @@ uint8_t* wolfBoot_peek_image(struct wolfBoot_image *img, uint32_t offset, uint32
asm volatile("bge fail_check"); \ asm volatile("bge fail_check"); \
asm volatile("b end_check"); \ asm volatile("b end_check"); \
asm volatile("fail_check:"); \ asm volatile("fail_check:"); \
asm volatile("pop {r7, r8, r9}"); \
asm volatile("mov r0, #0xFFFFFFFF"); \ asm volatile("mov r0, #0xFFFFFFFF"); \
asm volatile("mov r0, #0xFFFFFFFF"); \ asm volatile("mov r0, #0xFFFFFFFF"); \
asm volatile("mov r0, #0xFFFFFFFF"); \ asm volatile("mov r0, #0xFFFFFFFF"); \
asm volatile("mov r0, #0xFFFFFFFF"); \ asm volatile("mov r0, #0xFFFFFFFF"); \
asm volatile("mov r0, #0xFFFFFFFF"); \ asm volatile("mov r0, #0xFFFFFFFF"); \
asm volatile("ldmia.w sp!, {r4, r5, r6, r8, r9, pc}"); \ asm volatile("bx lr"); \
asm volatile("nop"); \ asm volatile("bx lr"); \
asm volatile("ldmia.w sp!, {r4, r5, r6, r8, r9, pc}"); \ asm volatile("bx lr"); \
asm volatile("nop"); \ asm volatile("bx lr"); \
asm volatile("ldmia.w sp!, {r4, r5, r6, r8, r9, pc}"); \ asm volatile("bx lr"); \
asm volatile("nop"); \
asm volatile("ldmia.w sp!, {r4, r5, r6, r8, r9, pc}"); \
asm volatile("nop"); \
asm volatile("end_check:") asm volatile("end_check:")
#else #else

13
src/update_flash.c
View File

@ -325,6 +325,11 @@ out:
#endif #endif
#ifdef WOLFBOOT_ARMORED
# pragma GCC push_options
# pragma GCC optimize("O0")
#endif
static int RAMFUNCTION wolfBoot_update(int fallback_allowed) static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
{ {
uint32_t total_size = 0; uint32_t total_size = 0;
@ -467,14 +472,6 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
return 0; return 0;
} }
#define likely(x) __builtin_expect((x),1)
#define unlikely(x) __builtin_expect((x),0)
#ifdef WOLFBOOT_ARMORED
# pragma GCC push_options
# pragma GCC optimize("O0")
#endif
void RAMFUNCTION wolfBoot_start(void) void RAMFUNCTION wolfBoot_start(void)
{ {
uint8_t st; uint8_t st;