summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-09-19 20:35:05 -0400
committerTom Rini <trini@konsulko.com>2018-09-19 20:35:05 -0400
commit333279af23ac08ebc8d8056c677c98964dd013b6 (patch)
tree0bf60843317e6cf18fb99371cd9f6416c8b1e8fe /env
parent4e710ebb4463c8e031eb269c012fbadb2479608b (diff)
parente32ac37119394f2d3c579b2cdd549bed59fb583f (diff)
Merge git://git.denx.de/u-boot-marvell
- Multiples updates to the turris boards / platform - Changes / enhancements to the Marvell PHY drivers, mainly to support the turris platform - Many fixes and enhancements to the pxa3xx NAND driver - Fixes for the UART boot mode in kwboot - Misc minor changes to other 32bit and 64bit boards
Diffstat (limited to 'env')
-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;