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

UPSTREAM: spi: Migrate CONFIG_CF_SPI to Kconfig 

Change-Id: Ia9f6139d87f28ef8bbab5effb15b3e00e53e732d
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit fbca0e66cc982325d8031094736d79ed007e42e2)
This commit is contained in:
Tuomas Tynkkynen 2018-02-07 02:42:23 +02:00 committed by Kever Yang
parent 5932b8bc8c
commit 845f53cfd3
23 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/M52277EVB_defconfig
View File

@ -18,3 +18,4 @@ CONFIG_ENV_IS_IN_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M52277EVB_stmicro_defconfig
View File

@ -17,3 +17,4 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M54418TWR_defconfig
View File

@ -21,3 +21,4 @@ CONFIG_CMD_CACHE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y
CONFIG_CF_SPI=y

1
configs/M54418TWR_nand_mii_defconfig
View File

@ -20,3 +20,4 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y
CONFIG_CF_SPI=y

1
configs/M54418TWR_nand_rmii_defconfig
View File

@ -20,3 +20,4 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y
CONFIG_CF_SPI=y

1
configs/M54418TWR_nand_rmii_lowfreq_defconfig
View File

@ -20,3 +20,4 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y
CONFIG_CF_SPI=y

1
configs/M54418TWR_serial_mii_defconfig
View File

@ -21,3 +21,4 @@ CONFIG_CMD_CACHE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y
CONFIG_CF_SPI=y

1
configs/M54418TWR_serial_rmii_defconfig
View File

@ -21,3 +21,4 @@ CONFIG_CMD_CACHE=y
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_ATMEL=y
CONFIG_CF_SPI=y

1
configs/M54451EVB_defconfig
View File

@ -21,3 +21,4 @@ CONFIG_ENV_IS_IN_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M54451EVB_stmicro_defconfig
View File

@ -20,3 +20,4 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M54455EVB_a66_defconfig
View File

@ -25,3 +25,4 @@ CONFIG_ENV_IS_IN_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M54455EVB_defconfig
View File

@ -26,3 +26,4 @@ CONFIG_ENV_IS_IN_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M54455EVB_i66_defconfig
View File

@ -25,3 +25,4 @@ CONFIG_ENV_IS_IN_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M54455EVB_intel_defconfig
View File

@ -25,3 +25,4 @@ CONFIG_ENV_IS_IN_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/M54455EVB_stm33_defconfig
View File

@ -25,3 +25,4 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_CF_SPI=y

1
configs/stmark2_defconfig
View File

@ -28,4 +28,5 @@ CONFIG_MTD_DEVICE=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ISSI=y CONFIG_SPI_FLASH_ISSI=y
CONFIG_SPI_FLASH_MTD=y CONFIG_SPI_FLASH_MTD=y
CONFIG_CF_SPI=y
CONFIG_REGEX=y CONFIG_REGEX=y

6
drivers/spi/Kconfig
View File

@ -227,6 +227,12 @@ config SOFT_SPI
Enable Soft SPI driver. This driver is to use GPIO simulate Enable Soft SPI driver. This driver is to use GPIO simulate
the SPI protocol. the SPI protocol.
config CF_SPI
bool "ColdFire SPI driver"
help
Enable the ColdFire SPI driver. This driver can be used on
some m68k SoCs.
config FSL_ESPI config FSL_ESPI
bool "Freescale eSPI driver" bool "Freescale eSPI driver"
help help

1
include/configs/M52277EVB.h
View File

@ -106,7 +106,6 @@
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */
#define CONFIG_CF_SPI
#define CONFIG_CF_DSPI #define CONFIG_CF_DSPI
#define CONFIG_HARD_SPI #define CONFIG_HARD_SPI
#define CONFIG_SYS_SBFHDR_SIZE 0x7 #define CONFIG_SYS_SBFHDR_SIZE 0x7

1
include/configs/M54418TWR.h
View File

@ -155,7 +155,6 @@
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */
#define CONFIG_CF_SPI
#define CONFIG_CF_DSPI #define CONFIG_CF_DSPI
#define CONFIG_SERIAL_FLASH #define CONFIG_SERIAL_FLASH
#define CONFIG_HARD_SPI #define CONFIG_HARD_SPI

1
include/configs/M54451EVB.h
View File

@ -119,7 +119,6 @@
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */
#define CONFIG_CF_SPI
#define CONFIG_CF_DSPI #define CONFIG_CF_DSPI
#define CONFIG_SERIAL_FLASH #define CONFIG_SERIAL_FLASH
#define CONFIG_HARD_SPI #define CONFIG_HARD_SPI

1
include/configs/M54455EVB.h
View File

@ -146,7 +146,6 @@
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */
#define CONFIG_CF_SPI
#define CONFIG_CF_DSPI #define CONFIG_CF_DSPI
#define CONFIG_HARD_SPI #define CONFIG_HARD_SPI
#define CONFIG_SYS_SBFHDR_SIZE 0x13 #define CONFIG_SYS_SBFHDR_SIZE 0x13

1
include/configs/stmark2.h
View File

@ -71,7 +71,6 @@
#undef CONFIG_MCFPIT #undef CONFIG_MCFPIT
/* DSPI and Serial Flash */ /* DSPI and Serial Flash */
#define CONFIG_CF_SPI
#define CONFIG_CF_DSPI #define CONFIG_CF_DSPI
#define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_SF_DEFAULT_SPEED 50000000
#define CONFIG_SERIAL_FLASH #define CONFIG_SERIAL_FLASH

1
scripts/config_whitelist.txt
View File

@ -258,7 +258,6 @@ CONFIG_CFG_DATA_SECTOR
CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
CONFIG_CF_DSPI CONFIG_CF_DSPI
CONFIG_CF_SBF CONFIG_CF_SBF
CONFIG_CF_SPI
CONFIG_CF_V2 CONFIG_CF_V2
CONFIG_CF_V3 CONFIG_CF_V3
CONFIG_CF_V4 CONFIG_CF_V4