GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-26 16:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert CONFIG_DEFAULT_SPI_* to Kconfig

Browse source 
This converts the following to Kconfig:
   CONFIG_DEFAULT_SPI_BUS
   CONFIG_DEFAULT_SPI_MODE

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2019-02-27 15:20:37 +01:00 • committed by Tom Rini
parent 14453fbfad
commit c95e632de4
17 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/Kconfig
View file

@ -1040,10 +1040,20 @@ config CMD_SF_TEST
everything is working properly. everything is working properly.
config CMD_SPI config CMD_SPI
bool "sspi" bool "sspi - Command to access spi device"
help help
SPI utility command. SPI utility command.
config DEFAULT_SPI_BUS
int "default spi bus used by sspi command"
depends on CMD_SPI
default 0
config DEFAULT_SPI_MODE
hex "default spi mode used by sspi command (see include/spi.h)"
depends on CMD_SPI
default 0
config CMD_TSI148 config CMD_TSI148
bool "tsi148 - Command to access tsi148 device" bool "tsi148 - Command to access tsi148 device"
help help

7
cmd/spi.c
View file

@ -22,13 +22,6 @@
# define MAX_SPI_BYTES 32 /* Maximum number of bytes we can handle */ # define MAX_SPI_BYTES 32 /* Maximum number of bytes we can handle */
#endif #endif
#ifndef CONFIG_DEFAULT_SPI_BUS
# define CONFIG_DEFAULT_SPI_BUS 0
#endif
#ifndef CONFIG_DEFAULT_SPI_MODE
# define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
#endif
/* /*
* Values from last command. * Values from last command.
*/ */

1
configs/bg0900_defconfig
View file

@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y
CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TRIMFFS=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=2
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y

3
configs/ls1012aqds_qspi_defconfig
View file

@ -27,7 +27,10 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_PCI=y CONFIG_CMD_PCI=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=1
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_DEFAULT_SPI_BUS=1
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_DATE=y CONFIG_CMD_DATE=y

2
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
View file

@ -27,6 +27,8 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_PCI=y CONFIG_CMD_PCI=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=1
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y

2
configs/ls1012aqds_tfa_defconfig
View file

@ -27,6 +27,8 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_PCI=y CONFIG_CMD_PCI=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=1
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y

1
configs/mx28evk_auart_console_defconfig
View file

@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TRIMFFS=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=2
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y

1
configs/mx28evk_defconfig
View file

@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TRIMFFS=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=2
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y

1
configs/mx28evk_nand_defconfig
View file

@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TRIMFFS=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=2
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y

1
configs/mx28evk_spi_defconfig
View file

@ -22,6 +22,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_NAND_TRIMFFS=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=2
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y

2
configs/mx31pdk_defconfig
View file

@ -13,6 +13,8 @@ CONFIG_SPL_NAND_SUPPORT=y
# CONFIG_AUTO_COMPLETE is not set # CONFIG_AUTO_COMPLETE is not set
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_DEFAULT_SPI_BUS=1
CONFIG_DEFAULT_SPI_MODE=4
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y

7
include/configs/bg0900.h
View file

@ -19,11 +19,6 @@
#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC
#endif #endif
/* SPI */
#ifdef CONFIG_CMD_SPI
#define CONFIG_DEFAULT_SPI_BUS 2
#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
/* SPI FLASH */ /* SPI FLASH */
#ifdef CONFIG_CMD_SF #ifdef CONFIG_CMD_SF
#define CONFIG_ENV_SPI_BUS 2 #define CONFIG_ENV_SPI_BUS 2
@ -32,8 +27,6 @@
#define CONFIG_ENV_SPI_MODE SPI_MODE_0 #define CONFIG_ENV_SPI_MODE SPI_MODE_0
#endif #endif
#endif
/* Boot Linux */ /* Boot Linux */
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTCOMMAND "bootm" #define CONFIG_BOOTCOMMAND "bootm"

1
include/configs/cl-som-am57x.h
View file

@ -27,7 +27,6 @@
/* SPI Flash support */ /* SPI Flash support */
#define CONFIG_TI_SPI_MMAP #define CONFIG_TI_SPI_MMAP
#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3
/* SPI SPL defines */ /* SPI SPL defines */
/* Offsets: 0K - SPL1, 64K - SPL2, 128K - SPL3, 192K - SPL4, 256K - U-Boot */ /* Offsets: 0K - SPL1, 64K - SPL2, 128K - SPL3, 192K - SPL4, 256K - U-Boot */

2
include/configs/ls1012aqds.h
View file

@ -74,9 +74,7 @@
/* DSPI */ /* DSPI */
#define CONFIG_FSL_DSPI1 #define CONFIG_FSL_DSPI1
#define CONFIG_DEFAULT_SPI_BUS 1
#define CONFIG_CMD_SPI
#define MMAP_DSPI DSPI1_BASE_ADDR #define MMAP_DSPI DSPI1_BASE_ADDR
#define CONFIG_SYS_DSPI_CTAR0 1 #define CONFIG_SYS_DSPI_CTAR0 1

6
include/configs/mx28evk.h
View file

@ -74,12 +74,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
#endif #endif
/* SPI */
#ifdef CONFIG_CMD_SPI
#define CONFIG_DEFAULT_SPI_BUS 2
#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
#endif
/* Framebuffer support */ /* Framebuffer support */
#ifdef CONFIG_VIDEO #ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO

3
include/configs/mx31pdk.h
View file

@ -43,9 +43,6 @@
#define CONFIG_MXC_UART #define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_DEFAULT_SPI_BUS 1
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
/* PMIC Controller */ /* PMIC Controller */
#define CONFIG_POWER #define CONFIG_POWER
#define CONFIG_POWER_SPI #define CONFIG_POWER_SPI

2
scripts/config_whitelist.txt
View file

@ -340,8 +340,6 @@ CONFIG_DEEP_SLEEP
CONFIG_DEFAULT CONFIG_DEFAULT
CONFIG_DEFAULT_CONSOLE CONFIG_DEFAULT_CONSOLE
CONFIG_DEFAULT_IMMR CONFIG_DEFAULT_IMMR
CONFIG_DEFAULT_SPI_BUS
CONFIG_DEFAULT_SPI_MODE
CONFIG_DEF_HWCONFIG CONFIG_DEF_HWCONFIG
CONFIG_DELAY_ENVIRONMENT CONFIG_DELAY_ENVIRONMENT
CONFIG_DESIGNWARE_ETH CONFIG_DESIGNWARE_ETH