diff options
| author | Ye Li <ye.li@nxp.com> | 2019-12-05 19:58:20 -0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2019-12-05 21:18:11 -0800 |
| commit | de526460611fb5ce855854f0df909fa76f13501e (patch) | |
| tree | 73a87a388db325e19c8f887f934f00936450d33e /arch | |
| parent | de2cebfc8903a5d75b6b8a08185febd97a9575b0 (diff) | |
MLK-23088 imx8mn: Fix u-boot hang when ENV_IS_NOWHERE is enabled
By default we enable two env storage devices: SD/emmc or Flexspi. And
u-boot will select it according to boot device.
Some customer does not save env, so he removes these storage devices and
enable ENV_IS_NOWHERE. But current env_get_location does not process
the ENV_IS_NOWHERE, returns ENVL_UNKNOWN and causes u-boot hang.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 8ca25fba643e4cdbd71f8c7a41d0991e57388fc8)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 1f90d6681d..a47102f9cf 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -971,7 +971,7 @@ enum env_location env_get_location(enum env_operation op, int prio) break; #endif default: -#ifdef CONFIG_ENV_DEFAULT_NOWHERE +#if defined(CONFIG_ENV_DEFAULT_NOWHERE) || defined(CONFIG_ENV_IS_NOWHERE) env_loc = ENVL_NOWHERE; #endif break; |