michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dfu: Switch from FLASH_AREA_ to FIXED_PARTITION_ macros

Browse source 
The commit switches flash area access from FLASH_AREA_ macros
to FIXED_PARTITION_ macros.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2022-07-22 14:44:45 +00:00 • committed by Carles Cufí
commit 51d676d601
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
subsys/dfu/boot/mcuboot_priv.h
View file

@ -10,15 +10,19 @@
#include <zephyr/storage/flash_map.h> #include <zephyr/storage/flash_map.h>
/* FLASH_AREA_ID() values used below are auto-generated by DT */
#ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE #ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE
#define FLASH_AREA_IMAGE_PRIMARY FLASH_AREA_ID(image_0_nonsecure) #define SLOT0_LABEL slot0_ns_partition
#define FLASH_AREA_IMAGE_SECONDARY FLASH_AREA_ID(image_1_nonsecure) #define SLOT1_LABEL slot1_ns_partition
#else #else
#define FLASH_AREA_IMAGE_PRIMARY FLASH_AREA_ID(image_0) #define SLOT0_LABEL slot0_partition
#if FLASH_AREA_LABEL_EXISTS(image_1) #define SLOT1_LABEL slot1_partition
#define FLASH_AREA_IMAGE_SECONDARY FLASH_AREA_ID(image_1)
#endif
#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */ #endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */
/* FIXED_PARTITION_ID() values used below are auto-generated by DT */
#define FLASH_AREA_IMAGE_PRIMARY FIXED_PARTITION_ID(SLOT0_LABEL)
#if FIXED_PARTITION_EXISTS(SLOT1_LABEL)
#define FLASH_AREA_IMAGE_SECONDARY FIXED_PARTITION_ID(SLOT1_LABEL)
#endif
#endif /* ZEPHYR_DFU_BOOT_MCUBOOT_H_ */ #endif /* ZEPHYR_DFU_BOOT_MCUBOOT_H_ */

16
subsys/dfu/img_util/flash_img.c
View file

@ -18,20 +18,20 @@
#endif #endif
#include <zephyr/devicetree.h> #include <zephyr/devicetree.h>
/* FLASH_AREA_ID() values used below are auto-generated by DT */
#ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE #ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE
#define UPLOAD_FLASH_AREA_LABEL image_1_nonsecure #define UPLOAD_FLASH_AREA_LABEL slot1_ns_partition
#else #else
#if FLASH_AREA_LABEL_EXISTS(image_1) #if FIXED_PARTITION_EXISTS(slot1_partition)
#define UPLOAD_FLASH_AREA_LABEL image_1 #define UPLOAD_FLASH_AREA_LABEL slot1_partition
#else #else
#define UPLOAD_FLASH_AREA_LABEL image_0 #define UPLOAD_FLASH_AREA_LABEL slot0_partition
#endif
#endif #endif
#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE */
#define UPLOAD_FLASH_AREA_ID FLASH_AREA_ID(UPLOAD_FLASH_AREA_LABEL) /* FIXED_PARTITION_ID() values used below are auto-generated by DT */
#define UPLOAD_FLASH_AREA_ID FIXED_PARTITION_ID(UPLOAD_FLASH_AREA_LABEL)
#define UPLOAD_FLASH_AREA_CONTROLLER \ #define UPLOAD_FLASH_AREA_CONTROLLER \
DT_GPARENT(DT_NODE_BY_FIXED_PARTITION_LABEL(UPLOAD_FLASH_AREA_LABEL)) DT_GPARENT(DT_NODELABEL(UPLOAD_FLASH_AREA_LABEL))
#if DT_NODE_HAS_PROP(UPLOAD_FLASH_AREA_CONTROLLER, write_block_size) #if DT_NODE_HAS_PROP(UPLOAD_FLASH_AREA_CONTROLLER, write_block_size)
#define FLASH_WRITE_BLOCK_SIZE \ #define FLASH_WRITE_BLOCK_SIZE \