diff mbox series

[PATCHv2,31/31] Convert CONFIG_CADENCE_QSPI to Kconfig

Message ID 20200616230631.29189-31-trini@konsulko.com
State Accepted
Commit 582b4f7f394da21fcb96a56e29dd68115a746b44
Headers show
Series [PATCHv2,01/31] Convert CONFIG_AM335X_LCD to Kconfig | expand

Commit Message

Tom Rini June 16, 2020, 11:06 p.m. UTC 
This converts the following to Kconfig:
   CONFIG_CADENCE_QSPI

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 configs/k2g_evm_defconfig    | 1 +
 configs/k2g_hs_evm_defconfig | 1 +
 drivers/spi/Makefile         | 2 +-
 include/configs/k2g_evm.h    | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

Comments

Tom Rini June 30, 2020, 3:20 p.m. UTC | #1 
On Tue, Jun 16, 2020 at 07:06:31PM -0400, Tom Rini wrote:

> This converts the following to Kconfig:
>    CONFIG_CADENCE_QSPI
> 
> Signed-off-by: Tom Rini <trini at konsulko.com>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
index c763ead401b1..b7310900e4c5 100644
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@ -74,6 +74,7 @@  CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
+CONFIG_CADENCE_QSPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig
index f089be4f563a..adedfddf4f50 100644
--- a/configs/k2g_hs_evm_defconfig
+++ b/configs/k2g_hs_evm_defconfig
@@ -62,6 +62,7 @@  CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
+CONFIG_CADENCE_QSPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 9559e938d262..4e7461771f2b 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -6,6 +6,7 @@ 
 # There are many options which enable SPI, so make this library available
 ifdef CONFIG_$(SPL_TPL_)DM_SPI
 obj-y += spi-uclass.o
+obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o
 obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o
 obj-$(CONFIG_SOFT_SPI) += soft_spi.o
 obj-$(CONFIG_SPI_MEM) += spi-mem.o
@@ -22,7 +23,6 @@  obj-$(CONFIG_ATMEL_SPI) += atmel_spi.o
 obj-$(CONFIG_BCM63XX_HSSPI) += bcm63xx_hsspi.o
 obj-$(CONFIG_BCM63XX_SPI) += bcm63xx_spi.o
 obj-$(CONFIG_BCMSTB_SPI) += bcmstb_spi.o
-obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o
 obj-$(CONFIG_CF_SPI) += cf_spi.o
 obj-$(CONFIG_DAVINCI_SPI) += davinci_spi.o
 obj-$(CONFIG_DESIGNWARE_SPI) += designware_spi.o
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 25f3959533c6..83466b9e0cfa 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -82,7 +82,6 @@ 
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_CADENCE_QSPI
 #define CONFIG_CQSPI_REF_CLK 384000000
 #endif