Hi Simon,
On Sat, Jul 22, 2017 at 7:11 AM, Simon Glass sjg@chromium.org wrote:
This converts the following to Kconfig: CONFIG_CMD_SCSI
Signed-off-by: Simon Glass sjg@chromium.org
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 c3c389298d..3cc252ac27 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -878,6 +878,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@@ -931,6 +932,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@@ -958,6 +960,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 4be801cdfe..ce1a358e08 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1289,6 +1289,15 @@ config CMD_REISER reiserls - list files reiserload - load a file
+config CMD_SCSI
bool "scsi - Access to SCSI devices"select SCSIhelpThis provides a 'scsi' command which provides access to SCSI (SmallComputer System Interface) devices. The command provides a way toscan the bus, reset the bus, read and write data and get informationabout 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
This looks odd. I remember you have another patch previously that split CMD_SCSI from SCSI itself.
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 2f1863f1ee..10c10f2387 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -32,6 +32,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 c7102810a3..01db848b4e 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -32,6 +32,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 ea8e262317..c8864fa7b0 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -28,6 +28,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 ecc87fb6d2..d4a28a597c 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -65,7 +65,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 09af7829ca..a9beb80c92 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 162b866ad5..46cc33deac 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -137,7 +137,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 653837c689..8d7888aec8 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -53,7 +53,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 100b8511ac..9c3133caa8 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -143,7 +143,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 deae787358..79f2dc2987 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -299,7 +299,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 a0b39a355f..4949e182c9 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 --
Regards, Bin