Commit b7254d11 authored by Kumar Gala's avatar Kumar Gala Committed by Andrzej Puzdrowski
Browse files

zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA_ 



As we replace the legacy DT_FLASH_ support use the new FLASH_AREA_
macros.

Signed-off-by: default avatarKumar Gala <kumar.gala@linaro.org>
parent 5657d00e

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) ?                \

                                         DT_FLASH_AREA_IMAGE_0_ID : \

                                         DT_FLASH_AREA_IMAGE_0_ID)

                                         FLASH_AREA_ID(image_0) : \

                                         FLASH_AREA_ID(image_0))

#define FLASH_AREA_IMAGE_SECONDARY(x)  (((x) == 0) ?                \

                                         DT_FLASH_AREA_IMAGE_1_ID : \

                                         DT_FLASH_AREA_IMAGE_1_ID)

                                         FLASH_AREA_ID(image_1) : \

                                         FLASH_AREA_ID(image_1))

#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) ?                \

                                         DT_FLASH_AREA_IMAGE_0_ID : \

                                         FLASH_AREA_ID(image_0) : \

                                        ((x) == 1) ?                \

                                         DT_FLASH_AREA_IMAGE_2_ID : \

                                         FLASH_AREA_ID(image_2) : \

                                         255)

#define FLASH_AREA_IMAGE_SECONDARY(x)  (((x) == 0) ?                \

                                         DT_FLASH_AREA_IMAGE_1_ID : \

                                         FLASH_AREA_ID(image_1) : \

                                        ((x) == 1) ?                \

                                         DT_FLASH_AREA_IMAGE_3_ID : \

                                         FLASH_AREA_ID(image_3) : \

                                         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    DT_FLASH_AREA_IMAGE_SCRATCH_ID

#define FLASH_AREA_IMAGE_SCRATCH    FLASH_AREA_ID(image_scratch)

#endif



#endif /* __SYSFLASH_H__ */

boot/zephyr/include/target.h

+4 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 * everything we need.

 */

#include <soc.h>

#include <storage/flash_map.h>



#define FLASH_ALIGN FLASH_WRITE_BLOCK_SIZE
@@ -35,12 +36,9 @@ 
#if (!defined(CONFIG_XTENSA) && !defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL)) || \

    (defined(CONFIG_XTENSA) && !defined(JEDEC_SPI_NOR_0_LABEL)) || \

    !defined(FLASH_ALIGN) ||                  \

    !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))

    !(FLASH_AREA_LABEL_EXISTS(image_0)) || \

    !(FLASH_AREA_LABEL_EXISTS(image_1)) || \

    (!defined(CONFIG_BOOT_SWAP_USING_MOVE) && !(FLASH_AREA_LABEL_EXISTS(image_scratch)))

#error "Target support is incomplete; cannot build mcuboot."

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE