Use phase-aware configuration checks to make boot-device selection easier to extend while preserving the existing device priority.
Signed-off-by: Carlo Caione <[email protected]> --- arch/arm/mach-mediatek/spl.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c index 6f1ec052b95..125ebcd784f 100644 --- a/arch/arm/mach-mediatek/spl.c +++ b/arch/arm/mach-mediatek/spl.c @@ -33,15 +33,14 @@ void board_init_f(ulong dummy) u32 spl_boot_device(void) { -#if defined(CONFIG_SPL_SPI) - return BOOT_DEVICE_SPI; -#elif defined(CONFIG_SPL_MMC) - return BOOT_DEVICE_MMC1; -#elif defined(CONFIG_SPL_NAND_SUPPORT) - return BOOT_DEVICE_NAND; -#elif defined(CONFIG_SPL_NOR_SUPPORT) - return BOOT_DEVICE_NOR; -#else + if (CONFIG_IS_ENABLED(SPI)) + return BOOT_DEVICE_SPI; + if (CONFIG_IS_ENABLED(MMC)) + return BOOT_DEVICE_MMC1; + if (CONFIG_IS_ENABLED(NAND_SUPPORT)) + return BOOT_DEVICE_NAND; + if (CONFIG_IS_ENABLED(NOR_SUPPORT)) + return BOOT_DEVICE_NOR; + return BOOT_DEVICE_NONE; -#endif } -- 2.56.0
