Commit 014f42df authored by Kumar Gala's avatar Kumar Gala Committed by Kumar Gala
Browse files

zephyr: Replace DT_FLASH_DEV_NAME with DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL 



As upstream zephyr is phasing out DT_FLASH defines for non-partition
usage replace DT_FLASH_DEV_NAME with
DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL.

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

boot/zephyr/flash_map_extended.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


MCUBOOT_LOG_MODULE_DECLARE(mcuboot);



#if (!defined(CONFIG_XTENSA) && defined(DT_FLASH_DEV_NAME))

#if (!defined(CONFIG_XTENSA) && defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL))

#define FLASH_DEVICE_ID SOC_FLASH_0_ID

#define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS

#elif (defined(CONFIG_XTENSA) && defined(DT_JEDEC_SPI_NOR_0_LABEL))

boot/zephyr/include/target.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
/*

 * Sanity check the target support.

 */

#if (!defined(CONFIG_XTENSA) && !defined(DT_FLASH_DEV_NAME)) || \

#if (!defined(CONFIG_XTENSA) && !defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL)) || \

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

    !defined(FLASH_ALIGN) ||                  \

    !defined(DT_FLASH_AREA_IMAGE_0_OFFSET) || \

boot/zephyr/main.c

+4 −3
Original line number Diff line number Diff line
@@ -277,9 +277,10 @@ void main(void) 


    ZEPHYR_BOOT_LOG_START();



#if (!defined(CONFIG_XTENSA) && defined(DT_FLASH_DEV_NAME))

    if (!flash_device_get_binding(DT_FLASH_DEV_NAME)) {

        BOOT_LOG_ERR("Flash device %s not found", DT_FLASH_DEV_NAME);

#if (!defined(CONFIG_XTENSA) && defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL))

    if (!flash_device_get_binding(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL)) {

        BOOT_LOG_ERR("Flash device %s not found",

		     DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);

        while (1)

            ;

    }

CRA Git | Maintained and supported by SUSTech CRA and CCSE