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

Account for flags offset when FLAGS_HOME is defined

pull/573/head
Daniele Lacamera 2025-06-30 13:16:53 +02:00
parent 81a63eebcd
commit d14045aee6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libwolfboot.c
View File

@ -752,14 +752,18 @@ void RAMFUNCTION wolfBoot_update_trigger(void)
* FLAGS_INVERT needs erased flags because the bin-assemble's fill byte may
* not match what's in wolfBoot */
if (FLAGS_UPDATE_EXT()) {
ext_flash_erase(lastSector, SECTOR_FLAGS_SIZE);
ext_flash_erase(lastSector, WOLFBOOT_SECTOR_SIZE);
wolfBoot_set_partition_state(PART_UPDATE, st);
} else {
#ifndef NVM_FLASH_WRITEONCE
hal_flash_erase(lastSector, SECTOR_FLAGS_SIZE);
hal_flash_erase(lastSector, WOLFBOOT_SECTOR_SIZE);
wolfBoot_set_partition_state(PART_UPDATE, st);
#else
uint32_t magic = WOLFBOOT_MAGIC_TRAIL;
uint32_t offset = SECTOR_FLAGS_SIZE;
#ifdef FLAGS_HOME
offset -= (PART_BOOT_ENDFLAGS - PART_UPDATE_ENDFLAGS);
#endif
selSec = nvm_select_fresh_sector(PART_UPDATE);
XMEMCPY(NVM_CACHE, (uint8_t*)lastSector - WOLFBOOT_SECTOR_SIZE * selSec,
WOLFBOOT_SECTOR_SIZE);
@ -767,8 +771,8 @@ void RAMFUNCTION wolfBoot_update_trigger(void)
hal_flash_erase(lastSector - WOLFBOOT_SECTOR_SIZE * !selSec,
WOLFBOOT_SECTOR_SIZE);
NVM_CACHE[SECTOR_FLAGS_SIZE] = IMG_STATE_UPDATING;
memcpy(NVM_CACHE + SECTOR_FLAGS_SIZE + 1, &magic, sizeof(uint32_t));
NVM_CACHE[offset] = IMG_STATE_UPDATING;
memcpy(NVM_CACHE + offset + 1, &magic, sizeof(uint32_t));
hal_flash_write(lastSector - WOLFBOOT_SECTOR_SIZE * !selSec, NVM_CACHE,
WOLFBOOT_SECTOR_SIZE);
/* erase the previously selected sector */