diff options
| author | Tom Rini <trini@konsulko.com> | 2025-08-23 13:52:54 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-08-23 13:52:54 -0600 |
| commit | c635e3952c15f3573fde4aad91b1df76f11d1a8a (patch) | |
| tree | 9ef0d543d7db7a7ca8571694cdadce4eba5051f6 /arch/arm/mach-imx/imx9/scmi/soc.c | |
| parent | 94e690c44a03959c39f0f5a44a9b89c851af3b60 (diff) | |
| parent | cb5f3e4f5288f27c44753503ca6c75bd17d8a1f8 (diff) | |
Merge tag 'u-boot-imx-master-20250823' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/27447
- Fix the environment location when booting from USB on i.MX93.
- Fix env location when booting from USB on phycore-imx93.
- Fix conflict early SPL malloc address on imx93 boards.
Diffstat (limited to 'arch/arm/mach-imx/imx9/scmi/soc.c')
| -rw-r--r-- | arch/arm/mach-imx/imx9/scmi/soc.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/imx9/scmi/soc.c b/arch/arm/mach-imx/imx9/scmi/soc.c index 13f13ca7d10..f973652d0cb 100644 --- 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; } |