michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dfu/boot: non-secure app support

Browse source 
In non-secure Trustzone application dedicated flash non-secure
partition are used instead of regular one, which become secure
partition in Trustzone collaboration model.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
This commit is contained in:
Andrzej Puzdrowski 2019-04-11 12:09:52 +02:00 • committed by Anas Nashif
commit 945f9c7d54
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
subsys/dfu/boot/mcuboot.c
View file

@ -70,8 +70,15 @@ struct mcuboot_v1_raw_header {
#define FLASH_MIN_WRITE_SIZE DT_FLASH_WRITE_BLOCK_SIZE
/* DT_FLASH_AREA_IMAGE_XX_YY values used below are auto-generated by DT */
#ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE
#define FLASH_BANK0_ID DT_FLASH_AREA_IMAGE_0_NONSECURE_ID
#define FLASH_BANK1_ID DT_FLASH_AREA_IMAGE_1_NONSECURE_ID
#define FLASH_AREA_IMAGE_SCRATCH DT_FLASH_AREA_IMAGE_SCRATCH_ID
#else
#define FLASH_BANK0_ID DT_FLASH_AREA_IMAGE_0_ID
#define FLASH_BANK1_ID DT_FLASH_AREA_IMAGE_1_ID
#define FLASH_AREA_IMAGE_SCRATCH DT_FLASH_AREA_IMAGE_SCRATCH_ID
#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */
#define COPY_DONE_OFFS(bank_area) ((bank_area)->fa_size -\
BOOT_MAGIC_SZ - BOOT_MAX_ALIGN * 2)
@ -399,7 +406,7 @@ static int boot_read_swap_state(u8_t bank_id, struct boot_swap_state *state)
}
state->magic = rc;
if (bank_id != DT_FLASH_AREA_IMAGE_SCRATCH_ID) {
if (bank_id != FLASH_AREA_IMAGE_SCRATCH) {
rc = boot_copy_done_read(bank_id);
if (rc < 0) {
return rc;