diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-02 13:02:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-02 17:01:46 -0400 |
| commit | 592cd5defd4f71d34ffcbd8dd3326bc10f662e20 (patch) | |
| tree | 0824c4d2c60d79b7be18ba82209d899e4d4f8c34 /common/spl | |
| parent | 2ba8bf207481cfb319f54a1bef67f6f068831a58 (diff) | |
| parent | b3bec2525604d6b42bb9e7fd719c84b022447db3 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
This is the PR for SPI-NAND changes along with few spi changes.
[trini: Re-sync changes for ls1012afrwy_qspi*_defconfig]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/spl_spi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 280496fbe0..18dbc238bf 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -487,7 +487,7 @@ config SPL_NAND_SUPPORT help Enable support for NAND (Negative AND) flash in SPL. NAND flash can be used to allow SPL to load U-Boot from supported devices. - This enables the drivers in drivers/mtd/nand as part of an SPL + This enables the drivers in drivers/mtd/nand/raw as part of an SPL build. config SPL_NET_SUPPORT diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index e10cf0124f..ddc33fd3ce 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2011 OMICRON electronics GmbH * - * based on drivers/mtd/nand/nand_spl_load.c + * based on drivers/mtd/nand/raw/nand_spl_load.c * * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. |