qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: Convert CONFIG_DAVINCI_SPI to Kconfig 

This converts the following to Kconfig:
   CONFIG_DAVINCI_SPI

Signed-off-by: Adam Ford <aford173@gmail.com>
(cherry picked from commit 26410c1517bbb6d6f90de55b5fa65dac3c298bc7)
Change-Id: I7b2166d5ea20dcd0a0e79d6faa1c51fca4d6eef9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
This commit is contained in:
Adam Ford 2017-12-30 07:33:42 -06:00 committed by Kever Yang
parent c3bb0077c7
commit 2b9d6da418
20 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/da850_am18xxevm_defconfig
View File

@ -42,4 +42,6 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
# CONFIG_FAT_WRITE is not set

4
configs/da850evm_defconfig
View File

@ -45,4 +45,6 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
# CONFIG_FAT_WRITE is not set

3
configs/da850evm_direct_nor_defconfig
View File

@ -26,4 +26,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y

2
configs/ea20_defconfig
View File

@ -36,4 +36,6 @@ CONFIG_NAND_DAVINCI=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DAVINCI_SPI=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set

1
configs/k2e_evm_defconfig
View File

@ -45,6 +45,7 @@ CONFIG_DM_ETH=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y

1
configs/k2e_hs_evm_defconfig
View File

@ -34,6 +34,7 @@ CONFIG_DM_ETH=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y

1
configs/k2g_evm_defconfig
View File

@ -49,6 +49,7 @@ CONFIG_REMOTEPROC_TI_POWER=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y

1
configs/k2g_hs_evm_defconfig
View File

@ -37,6 +37,7 @@ CONFIG_REMOTEPROC_TI_POWER=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y

1
configs/k2hk_evm_defconfig
View File

@ -45,6 +45,7 @@ CONFIG_DM_ETH=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y

1
configs/k2hk_hs_evm_defconfig
View File

@ -34,6 +34,7 @@ CONFIG_DM_ETH=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y

1
configs/k2l_evm_defconfig
View File

@ -45,6 +45,7 @@ CONFIG_DM_ETH=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y

1
configs/legoev3_defconfig
View File

@ -27,5 +27,6 @@ CONFIG_CMD_DIAG=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DAVINCI_SPI=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

1
configs/omapl138_lcdk_defconfig
View File

@ -37,4 +37,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DAVINCI_SPI=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

6
drivers/spi/Kconfig
View File

@ -232,6 +232,12 @@ config ATCSPI200_SPI
used to access the SPI flash on AE3XX and AE250 platforms embedding used to access the SPI flash on AE3XX and AE250 platforms embedding
this Andestech IP core. 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 config TI_QSPI
bool "TI QSPI driver" bool "TI QSPI driver"
help help

3
include/configs/da850evm.h
View File

@ -137,7 +137,8 @@
#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_SPI #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 #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

1
include/configs/ea20.h
View File

@ -61,7 +61,6 @@
#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_DAVINCI_SPI
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

1
include/configs/legoev3.h
View File

@ -124,7 +124,6 @@
#define CONFIG_CONS_INDEX 1 /* use UART0 for console */ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_DAVINCI_SPI
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE #define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID) #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID)
#define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_SF_DEFAULT_SPEED 50000000

1
include/configs/omapl138_lcdk.h
View File

@ -129,7 +129,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_SPI #define CONFIG_SPI
#define CONFIG_DAVINCI_SPI
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

1
include/configs/ti_armv7_keystone2.h
View File

@ -78,7 +78,6 @@
#endif #endif
/* SPI Configuration */ /* SPI Configuration */
#define CONFIG_DAVINCI_SPI
#define CONFIG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6) #define CONFIG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6)
#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED

1
scripts/config_whitelist.txt
View File

@ -378,7 +378,6 @@ CONFIG_DA850_AM18X_EVM
CONFIG_DA850_EVM_MAX_CPU_CLK CONFIG_DA850_EVM_MAX_CPU_CLK
CONFIG_DA850_LOWLEVEL CONFIG_DA850_LOWLEVEL
CONFIG_DA8XX_GPIO CONFIG_DA8XX_GPIO
CONFIG_DAVINCI_SPI
CONFIG_DBAU1000 CONFIG_DBAU1000
CONFIG_DBAU1X00 CONFIG_DBAU1X00
CONFIG_DBGU CONFIG_DBGU