summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Porotchkin <kostap@marvell.com>2018-08-29 16:34:52 +0300
committerStefan Roese <sr@denx.de>2018-09-19 09:02:34 +0200
commit25a17652c9c2cc4d88098121fc6a2b8f90020531 (patch)
tree75d7a42367f5338a2c493b843151615d76400359
parente76afd84095a10e7cd9d8ee6b74ed94941e5f4f8 (diff)
downloadu-boot-25a17652c9c2cc4d88098121fc6a2b8f90020531.tar.gz
fix: env: Fix the SPI flash device setup for DM mode
For some reason the spi_flash_probe_bus_cs() is called inside the setup_flash_device() with zero values in place of configurated SPI flash mode and maximum flash speed. This code causes HALT error during startup environment relocation on some platforms - namely Armada-38x-GP board. Fix the function call by replacing zeros with the appropriate values - CONFIG_ENV_SPI_MAX_HZ and CONFIG_ENV_SPI_MODE. Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Cc: Igal Liberman <igall@marvell.com> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--env/sf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/env/sf.c b/env/sf.c
index 494510533a..2e3c600483 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -58,7 +58,8 @@ static int setup_flash_device(void)
/* speed and mode will be read from DT */
ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
- 0, 0, &new);
+ CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE,
+ &new);
if (ret) {
set_default_env("spi_flash_probe_bus_cs() failed", 0);
return ret;