This converts the following to Kconfig: CONFIG_CADENCE_QSPI
Signed-off-by: Tom Rini trini@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(-)
diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index d16e8f48bd83..b137238b9046 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -71,6 +71,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 f05ab0f6c8c2..534e702b0c3b 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 @@ -23,7 +24,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