ARM: imx8ulp: support env in fat and ext4

Change boot device logic to also allow environment stored in fat and
in ext4 when booting from SD or eMMC.

As the boot device check for SD and for eMMC was depending on
ENV_IS_IN_MMC being defined, change the ifdef blocks at
env_get_location to use IS_ENABLED instead for all modes, returning
NOWHERE when no valid mode is found.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Co-developed-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>

diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c
index fd436dd88514652466c268212ec52de479798c47..c3722c608366beab4394ac0e4c4e7acaf063b51b 100644 (file)
--- a/arch/arm/mach-imx/imx8ulp/soc.c
+++ b/arch/arm/mach-imx/imx8ulp/soc.c
@@ -865,33 +865,29 @@ u32 spl_arch_boot_image_offset(u32 image_offset, u32 rom_bt_dev)
 enum env_location env_get_location(enum env_operation op, int prio)
 {
        enum boot_device dev = get_boot_device();
-       enum env_location env_loc = ENVL_UNKNOWN;
 
        if (prio)
-               return env_loc;
+               return ENVL_UNKNOWN;
 
        switch (dev) {
-#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
        case QSPI_BOOT:
-               env_loc = ENVL_SPI_FLASH;
-               break;
-#endif
-#ifdef CONFIG_ENV_IS_IN_MMC
+               if (CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH))
+                       return ENVL_SPI_FLASH;
+               return ENVL_NOWHERE;
        case SD1_BOOT:
        case SD2_BOOT:
        case SD3_BOOT:
        case MMC1_BOOT:
        case MMC2_BOOT:
        case MMC3_BOOT:
-               env_loc =  ENVL_MMC;
-               break;
-#endif
+               if (CONFIG_IS_ENABLED(ENV_IS_IN_MMC))
+                       return ENVL_MMC;
+               else if (CONFIG_IS_ENABLED(ENV_IS_IN_EXT4))
+                       return ENVL_EXT4;
+               else if (CONFIG_IS_ENABLED(ENV_IS_IN_FAT))
+                       return ENVL_FAT;
+               return ENVL_NOWHERE;
        default:
-#if defined(CONFIG_ENV_IS_NOWHERE)
-               env_loc = ENVL_NOWHERE;
-#endif
-               break;
+               return ENVL_NOWHERE;
        }
-
-       return env_loc;
 }