diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-12 15:20:29 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-12 15:20:29 +0300 |
| commit | 6d35c24892c9d2f3eb03bee57c77cc9a3560c134 (patch) | |
| tree | 396170b7e892b0351bba96de513048a9b92c33bb /arch | |
| parent | 589c659035a44a683b087fd75fe0b7667f7be7f5 (diff) | |
| parent | 228173d8556ee3209c3c8ea6a296b355b28c7e15 (diff) | |
| download | u-boot-6d35c24892c9d2f3eb03bee57c77cc9a3560c134.tar.xz | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-spi
- sunXi SPI fixups (Andre)
- bcm iproc qspi (Rayagonda)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/Kconfig | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 391a77c2b4..4567c183fb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1062,6 +1062,8 @@ config ARCH_SUNXI select DM_ETH select DM_GPIO select DM_I2C if I2C + select DM_SPI if SPI + select DM_SPI_FLASH if SPI select DM_KEYBOARD select DM_MMC if MMC select DM_SCSI if SCSI diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index d1c60d2408..73da6b8f61 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -332,9 +332,6 @@ config MACH_SUN9I config MACH_SUN50I bool "sun50i (Allwinner A64)" select ARM64 - select SPI - select DM_SPI if SPI - select DM_SPI_FLASH select PHY_SUN4I_USB select SUN6I_PRCM select SUNXI_DE2 |