riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15306 from bergzand/pr/suit_stor_flashwrite/fix_offset

Browse Source 
suit/storage/flashwrite: use riotboot_slot_offset
This commit is contained in:
Koen Zandberg 2020-10-27 10:32:18 +01:00 committed by GitHub
commit f46572a308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/suit_update/tests/01-run.py
View File

@ -68,8 +68,7 @@ def publish(server_dir, server_url, app_ver, keys='default', latest_name=None):
def wait_for_update(child):
return child.expect([r"Fetching firmware \|[█ ]+\|\s+\d+\%",
"riotboot_flashwrite: riotboot flashing "
"completed successfully"],
"Finalizing payload store"],
timeout=UPDATING_TIMEOUT)

2
sys/suit/storage/flashwrite.c
View File

@ -174,7 +174,7 @@ static bool _flashwrite_match_offset(const suit_storage_t *storage,
(void)storage;
int target_slot = riotboot_slot_other();
uintptr_t slot_start = (intptr_t)riotboot_slot_get_hdr(target_slot);
uintptr_t slot_start = (uintptr_t)riotboot_slot_offset(target_slot);
return (slot_start == (uintptr_t)offset);
}