arm: imx: imx9: soc: Fix env location when booting from USB

On i.MX9 platforms, when booting from USB, the U-Boot environment is
always assumed to be in RAM. However, this causes the boot to hang when
`CONFIG_ENV_IS_NOWHERE` is not enabled. The boot also hangs even if the
environment is present in another storage media (for example, eMMC). Fix
the issue by correctly handling the U-Boot environment's location when
booting from USB. Also for i.MX95, set the environment location based on
the ENV config and not solely based on the boot device type.

Suggested-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: João Paulo Gonçalves <joao.goncalves@toradex.com>

diff --git a/arch/arm/mach-imx/imx9/scmi/soc.c b/arch/arm/mach-imx/imx9/scmi/soc.c
index 13f13ca..f973652 100644 (file)
--- a/arch/arm/mach-imx/imx9/scmi/soc.c
+++ b/arch/arm/mach-imx/imx9/scmi/soc.c
@@ -635,7 +635,8 @@ enum env_location env_get_location(enum env_operation op, int prio)
 
        switch (dev) {
        case QSPI_BOOT:
-               env_loc = ENVL_SPI_FLASH;
+               if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
+                       env_loc = ENVL_SPI_FLASH;
                break;
        case SD1_BOOT:
        case SD2_BOOT:
@@ -643,10 +644,16 @@ enum env_location env_get_location(enum env_operation op, int prio)
        case MMC1_BOOT:
        case MMC2_BOOT:
        case MMC3_BOOT:
-               env_loc =  ENVL_MMC;
+               if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC))
+                       env_loc =  ENVL_MMC;
                break;
        default:
-               env_loc = ENVL_NOWHERE;
+               if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE))
+                       env_loc = ENVL_NOWHERE;
+               else if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
+                       env_loc = ENVL_SPI_FLASH;
+               else if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC))
+                       env_loc = ENVL_MMC;
                break;
        }
 

diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 9fb8264..3f7dafd 100644 (file)
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -809,7 +809,13 @@ enum env_location env_get_location(enum env_operation op, int prio)
                        return ENVL_FAT;
                return ENVL_NOWHERE;
        default:
-               return ENVL_NOWHERE;
+               if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE))
+                       return ENVL_NOWHERE;
+               else if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
+                       return ENVL_SPI_FLASH;
+               else if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC))
+                       return ENVL_MMC;
+               return ENVL_UNKNOWN;
        }
 }