diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-04 22:34:44 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-11 19:41:55 (GMT) |
| commit | 0941f597a2bdb80164658c8fe165ee8da4ece6fc (patch) | |
| tree | 27533bc61cdbff6a9c4a2c58579085df494337f0 | |
| parent | 15dc63d646bd73f473141653db9a20a71aaaeced (diff) | |
| download | u-boot-fsl-qoriq-0941f597a2bdb80164658c8fe165ee8da4ece6fc.tar.xz | |
Convert CONFIG_CMD_SCSI to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_SCSI
Also update the Makefile to use CONFIG_CMD_SCSI instead of CONFIG_SCSI to
enable the command, fixing an earlier error.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
[trini: Rework to default y if SCSI, drop cl-som-am57x which did not use
CMD_SCSI for real]
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | cmd/Kconfig | 9 | ||||
| -rw-r--r-- | cmd/Makefile | 2 | ||||
| -rw-r--r-- | configs/controlcenterdc_defconfig | 1 | ||||
| -rw-r--r-- | configs/ls1012aqds_qspi_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/cl-som-am57x.h | 1 | ||||
| -rw-r--r-- | include/configs/controlcenterdc.h | 1 | ||||
| -rw-r--r-- | include/configs/ls1012aqds.h | 1 | ||||
| -rw-r--r-- | include/configs/ls1012ardb.h | 1 | ||||
| -rw-r--r-- | include/configs/ls1021aiot.h | 1 | ||||
| -rw-r--r-- | include/configs/ls1043ardb.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
11 files changed, 12 insertions, 8 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 9efc2cf..cf89fd7 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1290,6 +1290,15 @@ config CMD_REISER reiserls - list files reiserload - load a file +config CMD_SCSI + bool "scsi - Access to SCSI devices" + default y if SCSI + help + This provides a 'scsi' command which provides access to SCSI (Small + Computer System Interface) devices. The command provides a way to + scan the bus, reset the bus, read and write data and get information + about devices. + endmenu menu "Debug commands" diff --git a/cmd/Makefile b/cmd/Makefile index eff6bd6..a85fe25 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -106,7 +106,7 @@ obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o obj-$(CONFIG_SANDBOX) += host.o obj-$(CONFIG_CMD_SATA) += sata.o obj-$(CONFIG_CMD_SF) += sf.o -obj-$(CONFIG_SCSI) += scsi.o disk.o +obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SPI) += spi.o diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 98a0c00..b28319f 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y +CONFIG_CMD_SCSI=y CONFIG_EFI_PARTITION=y CONFIG_OF_BOARD_FIXUP=y CONFIG_SPL_OF_TRANSLATE=y diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index 383fc1a..dfc3786 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_SCSI=y CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 62bb2db..49db5a9 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -64,7 +64,6 @@ #ifndef CONFIG_SPL_BUILD /* SATA */ -#define CONFIG_CMD_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 979bb98..715e9ed 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -33,7 +33,6 @@ * Commands configuration */ #define CONFIG_CMD_I2C -#define CONFIG_CMD_SCSI #define CONFIG_CMD_SPI /* SPI NOR flash default params, used by sf commands */ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 4a84e6c..7bb65ab 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -138,7 +138,6 @@ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_CMD_SCSI #define CONFIG_SYS_SATA AHCI_BASE_ADDR diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index f4ed030..e9edcd2 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -52,7 +52,6 @@ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_CMD_SCSI #define CONFIG_SYS_SATA AHCI_BASE_ADDR diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 4806168..33b62cd 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -142,7 +142,6 @@ #define CONFIG_FSL_ESDHC /* SATA */ -#define CONFIG_CMD_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index a4162a6..ca1d862 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -292,7 +292,6 @@ #ifndef SPL_NO_SATA #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI -#define CONFIG_CMD_SCSI #ifndef CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT2 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2c255a7..f07f276 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -293,7 +293,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SCSI CONFIG_CMD_SDRAM CONFIG_CMD_SF_TEST CONFIG_CMD_SH_ZIMAGEBOOT |