diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-14 00:03:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-14 00:03:06 -0400 |
| commit | 216800acf1fbf9f498455bf3c92d4513d9a4c681 (patch) | |
| tree | 08ee65c9c73a954c71b6f6051725338f0f23fdcb /common | |
| parent | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (diff) | |
| parent | 59aea29a31869ed0fd5ffc4b95050db966fcaf6d (diff) | |
| download | u-boot-216800acf1fbf9f498455bf3c92d4513d9a4c681.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Conflicts:
arch/arm/dts/armada-385-amc.dts
arch/arm/dts/armada-xp-theadorable.dts
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 8cd4830a39..9b74473377 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -77,6 +77,8 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, /* * Load U-Boot image from SPI flash into RAM + * In DM mode: defaults speed and mode will be + * taken from DT when available */ flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, |