diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2017-10-05 00:27:21 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-10-25 10:05:05 +0200 |
| commit | a722359de4e1f68ad2392b2eb88cfca55f129637 (patch) | |
| tree | 6d8de00e28fa23fbff55640f20e5217c751d1ba8 | |
| parent | 4c7a211046a3956058b512edd8533f7df031cc4a (diff) | |
| download | u-boot-a722359de4e1f68ad2392b2eb88cfca55f129637.tar.gz | |
SPL: SPI: select SPL_SPI_FLASH_SUPPORT on SPL_SPI_SUNXI
The Allwinner SPI flash SPL boot support is guarded by the SPL_SPI_SUNXI
symbol. But despite its generic name, the actual only use case for this
is to provide SPI flash support to the SPL, which requires
CONFIG_SPL_SPI_FLASH_SUPPORT to be defined.
Select this symbol from the SPL_SPI_SUNXI Kconfig definition. This
avoids doing this explicitly in the defconfig, and fixes SPI booting on
the Pine64 SoPine (and -LTS version) and the OrangePi Win board (both with
SPI flash).
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| -rw-r--r-- | configs/orangepi_pc2_defconfig | 1 | ||||
| -rw-r--r-- | configs/orangepi_zero_defconfig | 1 | ||||
| -rw-r--r-- | drivers/mtd/spi/Kconfig | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index 5918e729d1..e5fea42fa6 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_MACH_SUN50I_H5=y CONFIG_DRAM_CLK=672 CONFIG_DRAM_ZQ=3881977 diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 1a16ed1ad6..5792e7a4a3 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=624 CONFIG_DRAM_ZQ=3881979 diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index 5700859ff2..6ba255d676 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -140,6 +140,7 @@ if SPL config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I + select SPL_SPI_FLASH_SUPPORT ---help--- Enable support for SPI Flash. This option allows SPL to read from sunxi SPI Flash. It uses the same method as the boot ROM, so does |