Revert "zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA_" (60cc5686) · Commits · Wenxi XU / Mcuboot

boot/zephyr/include/sysflash/sysflash.h

+9 −9

Original line number	Diff line number	Diff line
		@@ -13,32 +13,32 @@
		* running in single image mode.
		*/
		#define FLASH_AREA_IMAGE_PRIMARY(x) (((x) == 0) ? \
		FLASH_AREA_ID(image_0) : \
		FLASH_AREA_ID(image_0))
		DT_FLASH_AREA_IMAGE_0_ID : \
		DT_FLASH_AREA_IMAGE_0_ID)
		#define FLASH_AREA_IMAGE_SECONDARY(x) (((x) == 0) ? \
		FLASH_AREA_ID(image_1) : \
		FLASH_AREA_ID(image_1))
		DT_FLASH_AREA_IMAGE_1_ID : \
		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(x) (((x) == 0) ? \
		FLASH_AREA_ID(image_0) : \
		DT_FLASH_AREA_IMAGE_0_ID : \
		((x) == 1) ? \
		FLASH_AREA_ID(image_2) : \
		DT_FLASH_AREA_IMAGE_2_ID : \
		255)
		#define FLASH_AREA_IMAGE_SECONDARY(x) (((x) == 0) ? \
		FLASH_AREA_ID(image_1) : \
		DT_FLASH_AREA_IMAGE_1_ID : \
		((x) == 1) ? \
		FLASH_AREA_ID(image_3) : \
		DT_FLASH_AREA_IMAGE_3_ID : \
		255)
		#else
		#error "Image slot and flash area mapping is not defined"
		#endif

		#if !defined(CONFIG_BOOT_SWAP_USING_MOVE)
		#define FLASH_AREA_IMAGE_SCRATCH FLASH_AREA_ID(image_scratch)
		#define FLASH_AREA_IMAGE_SCRATCH DT_FLASH_AREA_IMAGE_SCRATCH_ID
		#endif

		#endif /* __SYSFLASH_H__ */

+6 −4

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		* everything we need.
		*/
		#include <soc.h>
		#include <storage/flash_map.h>

		#define FLASH_ALIGN FLASH_WRITE_BLOCK_SIZE

		@@ -36,9 +35,12 @@
		#if (!defined(CONFIG_XTENSA) && !defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL)) \|\| \
		(defined(CONFIG_XTENSA) && !defined(JEDEC_SPI_NOR_0_LABEL)) \|\| \
		!defined(FLASH_ALIGN) \|\| \
		!(FLASH_AREA_LABEL_EXISTS(image_0)) \|\| \
		!(FLASH_AREA_LABEL_EXISTS(image_1)) \|\| \
		(!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !(FLASH_AREA_LABEL_EXISTS(image_scratch)))
		!defined(DT_FLASH_AREA_IMAGE_0_OFFSET) \|\| \
		!defined(DT_FLASH_AREA_IMAGE_0_SIZE) \|\| \
		!defined(DT_FLASH_AREA_IMAGE_1_OFFSET) \|\| \
		!defined(DT_FLASH_AREA_IMAGE_1_SIZE) \|\| \
		(!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !defined(DT_FLASH_AREA_IMAGE_SCRATCH_OFFSET)) \|\| \
		(!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !defined(DT_FLASH_AREA_IMAGE_SCRATCH_SIZE))
		#error "Target support is incomplete; cannot build mcuboot."
		#endif