Boot: Extend flash layout for multiple images
This patch introduces the BOOT_IMAGE_NUMBER macro and current_image
variable to support multiple updatable images and the associated
extended flash layout.
The FLASH_AREA_IMAGE_* object-like macros are replaced with
function-like ones and therefore some functions have been updated,
because the labels of a switch statement and the initialization
values of objects with static storage duration have to be constant
expressions.
Change-Id: Ib7b26ec3c94233e52db4f97825ddb6a3e55bb1d3
Signed-off-by: David Vincze <david.vincze@arm.com>
diff --git a/boot/zephyr/include/mcuboot_config/mcuboot_config.h b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
index d79d556..925591c 100644
--- a/boot/zephyr/include/mcuboot_config/mcuboot_config.h
+++ b/boot/zephyr/include/mcuboot_config/mcuboot_config.h
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2018 Open Source Foundries Limited
+ * Copyright (c) 2019 Arm Limited
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -65,6 +66,12 @@
#define MCUBOOT_BOOTSTRAP 1
#endif
+#ifdef CONFIG_UPDATEABLE_IMAGE_NUMBER
+#define MCUBOOT_IMAGE_NUMBER CONFIG_UPDATEABLE_IMAGE_NUMBER
+#else
+#define MCUBOOT_IMAGE_NUMBER 1
+#endif
+
/*
* Enabling this option uses newer flash map APIs. This saves RAM and
* avoids deprecated API usage.
diff --git a/boot/zephyr/include/sysflash/sysflash.h b/boot/zephyr/include/sysflash/sysflash.h
index 2492244..d4617bb 100644
--- a/boot/zephyr/include/sysflash/sysflash.h
+++ b/boot/zephyr/include/sysflash/sysflash.h
@@ -4,9 +4,32 @@
#define __SYSFLASH_H__
#include <generated_dts_board.h>
+#include <mcuboot_config/mcuboot_config.h>
+extern uint8_t current_image;
+
+#if (MCUBOOT_IMAGE_NUMBER == 1)
#define FLASH_AREA_IMAGE_PRIMARY DT_FLASH_AREA_IMAGE_0_ID
#define FLASH_AREA_IMAGE_SECONDARY DT_FLASH_AREA_IMAGE_1_ID
+#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 ((current_image == 0) ? \
+ DT_FLASH_AREA_IMAGE_0_ID : \
+ (current_image == 1) ? \
+ DT_FLASH_AREA_IMAGE_2_ID : \
+ 255 )
+#define FLASH_AREA_IMAGE_SECONDARY ((current_image == 0) ? \
+ DT_FLASH_AREA_IMAGE_1_ID : \
+ (current_image == 1) ? \
+ DT_FLASH_AREA_IMAGE_3_ID : \
+ 255 )
+#else
+#error "Image slot and flash area mapping is not defined"
+#endif
+
#define FLASH_AREA_IMAGE_SCRATCH DT_FLASH_AREA_IMAGE_SCRATCH_ID
#endif /* __SYSFLASH_H__ */
diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h
index 6e777fb..a11616f 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -1,5 +1,7 @@
/*
* Copyright (C) 2017, Linaro Ltd
+ * Copyright (c) 2019, Arm Limited
+ *
* SPDX-License-Identifier: Apache-2.0
*/
@@ -45,4 +47,11 @@
#error "Target support is incomplete; cannot build mcuboot."
#endif
+#if ((MCUBOOT_IMAGE_NUMBER == 2) && (!defined(FLASH_AREA_IMAGE_2_OFFSET) || \
+ !defined(FLASH_AREA_IMAGE_2_SIZE) || \
+ !defined(FLASH_AREA_IMAGE_3_OFFSET) || \
+ !defined(FLASH_AREA_IMAGE_3_SIZE)))
+#error "Target support is incomplete; cannot build mcuboot."
#endif
+
+#endif /* H_TARGETS_TARGET_ */