Commit 48b8ef0a authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

Revert "Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros"" 



This reverts commit 39d1aef2.

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent 39d1aef2

boot/zephyr/include/target.h

+5 −1
Original line number Diff line number Diff line
@@ -25,11 +25,15 @@ 


#endif /* !defined(MCUBOOT_TARGET_CONFIG) */



#if DT_NODE_HAS_PROP(DT_INST(0, jedec_spi_nor), label)

#define JEDEC_SPI_NOR_0_LABEL DT_LABEL(DT_INST(0, jedec_spi_nor))

#endif



/*

 * Sanity check the target support.

 */

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

    (defined(CONFIG_XTENSA) && !defined(DT_JEDEC_SPI_NOR_0_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) || \

boot/zephyr/main.c

+3 −3
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ void main(void) 
        while (1)

            ;

    }

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

    if (!flash_device_get_binding(DT_JEDEC_SPI_NOR_0_LABEL)) {

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

#elif (defined(CONFIG_XTENSA) && defined(JEDEC_SPI_NOR_0_LABEL))

    if (!flash_device_get_binding(JEDEC_SPI_NOR_0_LABEL)) {

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

        while (1)

            ;

    }

CRA Git | Maintained and supported by SUSTech CRA and CCSE