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 ---
Changes in v2: - Update commit message to explain Makefile change
arch/arm/Kconfig | 3 +++ cmd/Kconfig | 9 +++++++++ cmd/Makefile | 2 +- configs/cl-som-am57x_defconfig | 1 + configs/controlcenterdc_defconfig | 1 + configs/ls1012aqds_qspi_defconfig | 1 + include/configs/cl-som-am57x.h | 1 - include/configs/controlcenterdc.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1043ardb.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5e42e7b030..477e76be29 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -879,6 +879,7 @@ config TARGET_LS1012ARDB select ARM64 select BOARD_LATE_INIT imply SCSI + imply CMD_SCSI help Support for Freescale LS1012ARDB platform. The LS1012A Reference design board (RDB) is a high-performance @@ -932,6 +933,7 @@ config TARGET_LS1021AIOT select ARCH_LS1021A select ARCH_SUPPORT_PSCI imply SCSI + imply CMD_SCSI help Support for Freescale LS1021AIOT platform. The LS1021A Freescale board (IOT) is a high-performance @@ -959,6 +961,7 @@ config TARGET_LS1043ARDB select SUPPORT_SPL select BOARD_EARLY_INIT_F imply SCSI + imply CMD_SCSI help Support for Freescale LS1043ARDB platform.
diff --git a/cmd/Kconfig b/cmd/Kconfig index f90673f95b..c74acd535b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1281,6 +1281,15 @@ config CMD_REISER reiserls - list files reiserload - load a file
+config CMD_SCSI + bool "scsi - Access to SCSI devices" + select 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 eff6bd678f..a85fe25dda 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/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index e0b7565ac0..71ce02d616 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_SCSI=y CONFIG_ISO_PARTITION=y CONFIG_CMD_PCA953X=y CONFIG_LED_STATUS=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index bb9c1b5d4f..4affd31ebd 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 383fc1a95f..dfc378677d 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 b9d6454887..afab46caae 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 979bb98850..715e9ed9c9 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 99f5dd4119..b3121d2c21 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -136,7 +136,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 f4ed0302a9..e9edcd2bc9 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 9896b0f04b..0c4e98d28f 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 937fd930ee..b95c2d87c0 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -294,7 +294,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 30b3451447..1ae87eb0b5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,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