Skip to content

Commit

Permalink
[nrf fromlist] zephyr: Provide slot definitions for three images
Browse files Browse the repository at this point in the history
Support for three pairs of slots.

Upstream PR: mcu-tools/mcuboot#1730

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
  • Loading branch information
de-nordic committed Aug 16, 2023
1 parent 7cdbee8 commit b65a7d6
Showing 1 changed file with 34 additions and 28 deletions.
62 changes: 34 additions & 28 deletions boot/zephyr/include/sysflash/sysflash.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/* Manual version of auto-generated version. */
/*
* Copyright (c) 2023 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

#if USE_PARTITION_MANAGER
/* Blocking the rest of the file */
Expand All @@ -12,40 +16,42 @@
#include <mcuboot_config/mcuboot_config.h>
#include <zephyr/devicetree.h>
#include <zephyr/storage/flash_map.h>
#include <zephyr/sys/util_macro.h>

#ifndef CONFIG_SINGLE_APPLICATION_SLOT

/* Each pair of slots is separated by , and there is no terminating character */
#define FLASH_AREA_IMAGE_0_SLOTS slot0_partition, slot1_partition
#define FLASH_AREA_IMAGE_1_SLOTS slot2_partition, slot3_partition
#define FLASH_AREA_IMAGE_2_SLOTS slot4_partition, slot5_partition

#if (MCUBOOT_IMAGE_NUMBER == 1)
/*
* NOTE: the definition below returns the same values for true/false on
* purpose, to avoid having to mark x as non-used by all callers when
* running in single image mode.
*/
#define FLASH_AREA_IMAGE_PRIMARY(x) (((x) == 0) ? \
FIXED_PARTITION_ID(slot0_partition) : \
FIXED_PARTITION_ID(slot0_partition))
#define FLASH_AREA_IMAGE_SECONDARY(x) (((x) == 0) ? \
FIXED_PARTITION_ID(slot1_partition) : \
FIXED_PARTITION_ID(slot1_partition))
#define ALL_AVAILABLE_SLOTS FLASH_AREA_IMAGE_0_SLOTS
#elif (MCUBOOT_IMAGE_NUMBER == 2)
/* MCUBoot currently supports only up to 2 updateable firmware images.
* If the number of the current image is greater than MCUBOOT_IMAGE_NUMBER - 1
* then a dummy value will be assigned to the flash area macros.
*/
#define FLASH_AREA_IMAGE_PRIMARY(x) (((x) == 0) ? \
FIXED_PARTITION_ID(slot0_partition) : \
((x) == 1) ? \
FIXED_PARTITION_ID(slot2_partition) : \
255)
#define FLASH_AREA_IMAGE_SECONDARY(x) (((x) == 0) ? \
FIXED_PARTITION_ID(slot1_partition) : \
((x) == 1) ? \
FIXED_PARTITION_ID(slot3_partition) : \
255)
#else
#error "Image slot and flash area mapping is not defined"
#define ALL_AVAILABLE_SLOTS FLASH_AREA_IMAGE_0_SLOTS, \
FLASH_AREA_IMAGE_1_SLOTS
#elif (MCUBOOT_IMAGE_NUMBER == 3)
#define ALL_AVAILABLE_SLOTS FLASH_AREA_IMAGE_0_SLOTS, \
FLASH_AREA_IMAGE_1_SLOTS, \
FLASH_AREA_IMAGE_2_SLOTS
#endif

static inline uint32_t __flash_area_ids_for_slot(int img, int slot)
{
static const int all_slots[] = {
FOR_EACH_NONEMPTY_TERM(FIXED_PARTITION_ID, (,), ALL_AVAILABLE_SLOTS)
};
return all_slots[img * 2 + slot];
};

#undef FLASH_AREA_IMAGE_0_SLOTS
#undef FLASH_AREA_IMAGE_1_SLOTS
#undef FLASH_AREA_IMAGE_2_SLOTS
#undef ALL_AVAILABLE_SLOTS

#define FLASH_AREA_IMAGE_PRIMARY(x) __flash_area_ids_for_slot(x, 0)
#define FLASH_AREA_IMAGE_SECONDARY(x) __flash_area_ids_for_slot(x, 1)

#if !defined(CONFIG_BOOT_SWAP_USING_MOVE)
#define FLASH_AREA_IMAGE_SCRATCH FIXED_PARTITION_ID(scratch_partition)
#endif
Expand Down

0 comments on commit b65a7d6

Please sign in to comment.