[U-Boot] [PATCH] Convert CONFIG_DAVINCI_SPI to Kconfig
This converts the following to Kconfig: CONFIG_DAVINCI_SPI
Signed-off-by: Adam Ford aford173@gmail.com --- configs/da850_am18xxevm_defconfig | 1 + configs/da850evm_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/ea20_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2e_hs_evm_defconfig | 1 + configs/k2g_evm_defconfig | 1 + configs/k2g_hs_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2hk_hs_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/legoev3_defconfig | 1 + configs/omapl138_lcdk_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/da850evm.h | 1 - include/configs/ea20.h | 1 - include/configs/legoev3.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - scripts/config_whitelist.txt | 1 - 20 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index 824c383..0675401 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -42,4 +42,5 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y # CONFIG_FAT_WRITE is not set diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 067ddd7..4c2f8f3 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -45,4 +45,5 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y # CONFIG_FAT_WRITE is not set diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index b00eea7..0d8a14e 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -43,3 +43,4 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index eada103..abbb00a 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -32,5 +32,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_DAVINCI_SPI=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 317d4f0..e6dc298 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index b9be606..6c5e167 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -33,6 +33,7 @@ CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 32353e9..6a1f8dc 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -47,6 +47,7 @@ CONFIG_REMOTEPROC_TI_POWER=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 9c4530c..b4985b5 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -35,6 +35,7 @@ CONFIG_REMOTEPROC_TI_POWER=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 7115443..1e3905f 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index f65185f..b4b08dd 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -33,6 +33,7 @@ CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index d2ec226..074bed0 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -44,6 +44,7 @@ CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y +CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig index 209250a..d131079 100644 --- a/configs/legoev3_defconfig +++ b/configs/legoev3_defconfig @@ -26,5 +26,6 @@ CONFIG_CMD_DIAG=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_DAVINCI_SPI=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 8d6b12f..6f23206 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -35,4 +35,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SYS_NS16550=y +CONFIG_DAVINCI_SPI=y CONFIG_OF_LIBFDT=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 494639f..5e31ee4 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -217,6 +217,12 @@ config ATCSPI200_SPI used to access the SPI flash on AE3XX and AE250 platforms embedding this Andestech IP core.
+config DAVINCI_SPI + bool "Davinci & Keystone SPI driver" + depends on ARCH_DAVINCI || ARCH_KEYSTONE + help + Enable the Davinci SPI driver + config TI_QSPI bool "TI QSPI driver" help diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 97effa8..9b9aa7f 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -147,7 +147,6 @@ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_SPI -#define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 9b5856e..efc72b3 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -58,7 +58,6 @@ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_SPI -#define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #define CONFIG_SF_DEFAULT_SPEED 30000000 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 105429b..3439cbe 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -121,7 +121,6 @@ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_SPI -#define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID) #define CONFIG_SF_DEFAULT_SPEED 50000000 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 570322e..2cb9911 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -128,7 +128,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_SPI -#define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #define CONFIG_SF_DEFAULT_SPEED 30000000 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 562bb65..86dd05d 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -78,7 +78,6 @@ #endif
/* SPI Configuration */ -#define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6) #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 11a53166..9985633 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -353,7 +353,6 @@ CONFIG_DA850_AM18X_EVM CONFIG_DA850_EVM_MAX_CPU_CLK CONFIG_DA850_LOWLEVEL CONFIG_DA8XX_GPIO -CONFIG_DAVINCI_SPI CONFIG_DBAU1000 CONFIG_DBAU1X00 CONFIG_DBGU
On Sat, Dec 30, 2017 at 07:33:42AM -0600, Adam Ford wrote:
This converts the following to Kconfig: CONFIG_DAVINCI_SPI
Signed-off-by: Adam Ford aford173@gmail.com
Applied to u-boot/master, thanks!
participants (2)
-
Adam Ford -
Tom Rini