michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mgmt/mcumgr: Don't add unused slots in img_mgmt_flash_area_id

Browse source 
The img_mgmt_flash_area_id would add processing of
slot2_partition and slot3_partition if they only exist, even if
not used at all.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2023-01-10 14:32:29 +00:00 • committed by Fabio Baltieri
commit 718be64e14
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c
View file

@ -34,6 +34,25 @@ BUILD_ASSERT(CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER == 1 ||
FIXED_PARTITION_EXISTS(SLOT3_PARTITION)), FIXED_PARTITION_EXISTS(SLOT3_PARTITION)),
"Missing partitions?"); "Missing partitions?");
#if defined(CONFIG_MCUMGR_GRP_IMG_DIRECT_UPLOAD) && \
!(CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1)
/* In case when direct upload is enabled, slot2 and slot3 are optional
* as long as there is support for one application image only.
*/
#define ADD_SLOT_2_CONDITION FIXED_PARTITION_EXISTS(SLOT2_PARTITION)
#define ADD_SLOT_3_CONDITION FIXED_PARTITION_EXISTS(SLOT3_PARTITION)
#elif (CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1)
/* For more than one application image slot2 and slot3 are required. */
#define ADD_SLOT_2_CONDITION 1
#define ADD_SLOT_3_CONDITION 1
#else
/* If neither in direct upload mode nor more than one application image
* is supported, then slot2 and slot3 support is useless.
*/
#define ADD_SLOT_2_CONDITION 0
#define ADD_SLOT_3_CONDITION 0
#endif
static int static int
img_mgmt_slot_to_image(int slot) img_mgmt_slot_to_image(int slot)
{ {
@ -41,8 +60,11 @@ img_mgmt_slot_to_image(int slot)
case 0: case 0:
case 1: case 1:
return 0; return 0;
#if FIXED_PARTITION_EXISTS(SLOT2_PARTITION) && FIXED_PARTITION_EXISTS(SLOT2_PARTITION) #if ADD_SLOT_2_CONDITION
case 2: case 2:
return 1;
#endif
#if ADD_SLOT_3_CONDITION
case 3: case 3:
return 1; return 1;
#endif #endif
@ -141,13 +163,13 @@ img_mgmt_flash_area_id(int slot)
fa_id = FIXED_PARTITION_ID(SLOT1_PARTITION); fa_id = FIXED_PARTITION_ID(SLOT1_PARTITION);
break; break;
#if FIXED_PARTITION_EXISTS(SLOT2_PARTITION) #if ADD_SLOT_2_CONDITION
case 2: case 2:
fa_id = FIXED_PARTITION_ID(SLOT2_PARTITION); fa_id = FIXED_PARTITION_ID(SLOT2_PARTITION);
break; break;
#endif #endif
#if FIXED_PARTITION_EXISTS(SLOT3_PARTITION) #if ADD_SLOT_3_CONDITION
case 3: case 3:
fa_id = FIXED_PARTITION_ID(SLOT3_PARTITION); fa_id = FIXED_PARTITION_ID(SLOT3_PARTITION);
break; break;