Browse Source

Convert CONFIG_SCSI to Kconfig

This converts the following to Kconfig:
   CONFIG_SCSI

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Simon Glass 7 years ago
parent
commit
fedb428c5b
84 changed files with 73 additions and 31 deletions
  1. 0 1
      README
  2. 1 0
      arch/Kconfig
  3. 10 0
      arch/arm/Kconfig
  4. 1 0
      arch/arm/cpu/armv7/ls102xa/Kconfig
  5. 2 0
      arch/arm/cpu/armv8/fsl-layerscape/Kconfig
  6. 0 1
      arch/arm/include/asm/arch-ls102xa/config.h
  7. 2 0
      arch/arm/mach-mvebu/Kconfig
  8. 2 0
      arch/arm/mach-omap2/omap5/Kconfig
  9. 1 0
      arch/powerpc/cpu/mpc85xx/Kconfig
  10. 1 0
      arch/powerpc/cpu/mpc86xx/Kconfig
  11. 1 0
      board/congatec/Kconfig
  12. 1 0
      board/dfi/Kconfig
  13. 1 0
      configs/A10-OLinuXino-Lime_defconfig
  14. 1 0
      configs/A20-OLinuXino-Lime2_defconfig
  15. 1 0
      configs/A20-OLinuXino-Lime_defconfig
  16. 1 0
      configs/A20-OLinuXino_MICRO_defconfig
  17. 1 0
      configs/A20-Olimex-SOM-EVB_defconfig
  18. 1 0
      configs/Bananapi_M2_Ultra_defconfig
  19. 1 0
      configs/Bananapi_defconfig
  20. 1 0
      configs/Bananapro_defconfig
  21. 1 0
      configs/Cubieboard2_defconfig
  22. 1 0
      configs/Cubieboard_defconfig
  23. 1 0
      configs/Cubietruck_defconfig
  24. 1 0
      configs/Itead_Ibox_A20_defconfig
  25. 1 0
      configs/Lamobo_R1_defconfig
  26. 1 0
      configs/Linksprite_pcDuino3_Nano_defconfig
  27. 1 0
      configs/Linksprite_pcDuino3_defconfig
  28. 1 0
      configs/MPC8544DS_defconfig
  29. 1 0
      configs/MPC8610HPCD_defconfig
  30. 1 0
      configs/Marsboard_A10_defconfig
  31. 1 0
      configs/Mele_A1000_defconfig
  32. 1 0
      configs/Mele_M5_defconfig
  33. 1 0
      configs/Orangepi_defconfig
  34. 1 0
      configs/Orangepi_mini_defconfig
  35. 1 0
      configs/Wits_Pro_A20_DKT_defconfig
  36. 1 0
      configs/bayleybay_defconfig
  37. 1 0
      configs/chromebook_link64_defconfig
  38. 1 0
      configs/chromebook_link_defconfig
  39. 1 0
      configs/chromebook_samus_defconfig
  40. 1 0
      configs/chromebox_panther_defconfig
  41. 1 0
      configs/cm_t54_defconfig
  42. 1 0
      configs/controlcenterdc_defconfig
  43. 1 0
      configs/cougarcanyon2_defconfig
  44. 1 0
      configs/crownbay_defconfig
  45. 1 0
      configs/db-88f6820-gp_defconfig
  46. 1 0
      configs/highbank_defconfig
  47. 1 0
      configs/ls1012aqds_qspi_defconfig
  48. 1 0
      configs/ls2081ardb_defconfig
  49. 1 0
      configs/minnowmax_defconfig
  50. 1 0
      configs/omap5_uevm_defconfig
  51. 1 0
      configs/som-db5800-som-6867_defconfig
  52. 1 0
      configs/xilinx_zynqmp_ep_defconfig
  53. 1 0
      configs/xilinx_zynqmp_zcu102_defconfig
  54. 1 0
      configs/xilinx_zynqmp_zcu102_revB_defconfig
  55. 9 0
      drivers/block/Kconfig
  56. 0 1
      include/config_cmd_all.h
  57. 0 1
      include/configs/MPC8544DS.h
  58. 0 1
      include/configs/MPC8572DS.h
  59. 0 1
      include/configs/MPC8610HPCD.h
  60. 0 1
      include/configs/MPC8641HPCN.h
  61. 0 1
      include/configs/am57xx_evm.h
  62. 0 1
      include/configs/cm_t54.h
  63. 0 1
      include/configs/controlcenterdc.h
  64. 0 1
      include/configs/db-88f6820-gp.h
  65. 0 1
      include/configs/dra7xx_evm.h
  66. 0 1
      include/configs/efi-x86.h
  67. 0 1
      include/configs/galileo.h
  68. 0 1
      include/configs/highbank.h
  69. 0 1
      include/configs/ls1012aqds.h
  70. 0 1
      include/configs/ls1012ardb.h
  71. 0 1
      include/configs/ls1043aqds.h
  72. 0 1
      include/configs/ls1046aqds.h
  73. 0 1
      include/configs/ls1046ardb.h
  74. 0 1
      include/configs/ls2080aqds.h
  75. 0 1
      include/configs/ls2080ardb.h
  76. 0 1
      include/configs/mvebu_armada-37xx.h
  77. 0 1
      include/configs/mvebu_armada-8k.h
  78. 0 1
      include/configs/omap5_uevm.h
  79. 0 1
      include/configs/qemu-x86.h
  80. 0 1
      include/configs/sandbox.h
  81. 0 1
      include/configs/sunxi-common.h
  82. 0 1
      include/configs/x86-common.h
  83. 0 1
      include/configs/xilinx_zynqmp.h
  84. 0 1
      scripts/config_whitelist.txt

+ 0 - 1
README

@@ -826,7 +826,6 @@ The following options need to be configured:
 		CONFIG_CMD_RUN		  run command in env variable
 		CONFIG_CMD_SANDBOX	* sb command to access sandbox features
 		CONFIG_CMD_SAVES	* save S record dump
-		CONFIG_SCSI		* SCSI Support
 		CONFIG_CMD_SDRAM	* print SDRAM configuration information
 					  (requires CONFIG_CMD_I2C)
 		CONFIG_CMD_SF		* Read/write/erase SPI NOR flash

+ 1 - 0
arch/Kconfig

@@ -75,6 +75,7 @@ config SANDBOX
 	imply FAT_WRITE
 	imply HASH_VERIFY
 	imply LZMA
+	imply SCSI
 
 config SH
 	bool "SuperH architecture"

+ 10 - 0
arch/arm/Kconfig

@@ -792,6 +792,7 @@ config TARGET_LS2080AQDS
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	select ARCH_MISC_INIT
+	imply SCSI
 	help
 	  Support for Freescale LS2080AQDS platform
 	  The LS2080A Development System (QDS) is a high-performance
@@ -806,6 +807,7 @@ config TARGET_LS2080ARDB
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	select ARCH_MISC_INIT
+	imply SCSI
 	help
 	  Support for Freescale LS2080ARDB platform.
 	  The LS2080A Reference design board (RDB) is a high-performance
@@ -866,6 +868,7 @@ config TARGET_LS1012ARDB
 	select ARCH_LS1012A
 	select ARM64
 	select BOARD_LATE_INIT
+	imply SCSI
 	help
 	  Support for Freescale LS1012ARDB platform.
 	  The LS1012A Reference design board (RDB) is a high-performance
@@ -894,6 +897,7 @@ config TARGET_LS1021AQDS
 	select LS1_DEEP_SLEEP
 	select SYS_FSL_DDR
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 
 config TARGET_LS1021ATWR
 	bool "Support ls1021atwr"
@@ -906,6 +910,7 @@ config TARGET_LS1021ATWR
 	select ARCH_SUPPORT_PSCI
 	select LS1_DEEP_SLEEP
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 
 config TARGET_LS1021AIOT
 	bool "Support ls1021aiot"
@@ -916,6 +921,7 @@ config TARGET_LS1021AIOT
 	select SUPPORT_SPL
 	select ARCH_LS1021A
 	select ARCH_SUPPORT_PSCI
+	imply SCSI
 	help
 	  Support for Freescale LS1021AIOT platform.
 	  The LS1021A Freescale board (IOT) is a high-performance
@@ -930,6 +936,7 @@ config TARGET_LS1043AQDS
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 	help
 	  Support for Freescale LS1043AQDS platform.
 
@@ -941,6 +948,7 @@ config TARGET_LS1043ARDB
 	select BOARD_LATE_INIT
 	select SUPPORT_SPL
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 	help
 	  Support for Freescale LS1043ARDB platform.
 
@@ -953,6 +961,7 @@ config TARGET_LS1046AQDS
 	select SUPPORT_SPL
 	select DM_SPI_FLASH if DM_SPI
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 	help
 	  Support for Freescale LS1046AQDS platform.
 	  The LS1046A Development System (QDS) is a high-performance
@@ -969,6 +978,7 @@ config TARGET_LS1046ARDB
 	select DM_SPI_FLASH if DM_SPI
 	select POWER_MC34VR500
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 	help
 	  Support for Freescale LS1046ARDB platform.
 	  The LS1046A Reference Design Board (RDB) is a high-performance

+ 1 - 0
arch/arm/cpu/armv7/ls102xa/Kconfig

@@ -14,6 +14,7 @@ config ARCH_LS1021A
 	select SYS_FSL_HAS_SEC
 	select SYS_FSL_SEC_COMPAT_5
 	select SYS_FSL_SEC_LE
+	imply SCSI
 
 menu "LS102xA architecture"
 	depends on ARCH_LS1021A

+ 2 - 0
arch/arm/cpu/armv8/fsl-layerscape/Kconfig

@@ -26,6 +26,7 @@ config ARCH_LS1043A
 	select SYS_FSL_HAS_DDR4
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 
 config ARCH_LS1046A
 	bool
@@ -46,6 +47,7 @@ config ARCH_LS1046A
 	select SYS_FSL_SRDS_2
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
+	imply SCSI
 
 config ARCH_LS2080A
 	bool

+ 0 - 1
arch/arm/include/asm/arch-ls102xa/config.h

@@ -81,7 +81,6 @@
 
 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
-#define CONFIG_SCSI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

+ 2 - 0
arch/arm/mach-mvebu/Kconfig

@@ -77,6 +77,7 @@ config TARGET_CLEARFOG
 config TARGET_MVEBU_ARMADA_37XX
 	bool "Support Armada 37xx platforms"
 	select ARMADA_3700
+	imply SCSI
 
 config TARGET_DB_88F6720
 	bool "Support DB-88F6720 Armada 375"
@@ -94,6 +95,7 @@ config TARGET_MVEBU_ARMADA_8K
 	bool "Support Armada 7k/8k platforms"
 	select ARMADA_8K
 	select BOARD_LATE_INIT
+	imply SCSI
 
 config TARGET_DB_MV784MP_GP
 	bool "Support db-mv784mp-gp"

+ 2 - 0
arch/arm/mach-omap2/omap5/Kconfig

@@ -25,12 +25,14 @@ config TARGET_DRA7XX_EVM
 	select DRA7XX
 	select TI_I2C_BOARD_DETECT
 	select PHYS_64BIT
+	imply SCSI
 
 config TARGET_AM57XX_EVM
 	bool "AM57XX"
 	select BOARD_LATE_INIT
 	select DRA7XX
 	select TI_I2C_BOARD_DETECT
+	imply SCSI
 
 endchoice
 

+ 1 - 0
arch/powerpc/cpu/mpc85xx/Kconfig

@@ -117,6 +117,7 @@ config TARGET_MPC8572DS
 	select ARCH_MPC8572
 # Use DDR3 controller with DDR2 DIMMs on this board
 	select SYS_FSL_DDRC_GEN3
+	imply SCSI
 
 config TARGET_P1010RDB_PA
 	bool "Support P1010RDB_PA"

+ 1 - 0
arch/powerpc/cpu/mpc86xx/Kconfig

@@ -21,6 +21,7 @@ config TARGET_MPC8610HPCD
 config TARGET_MPC8641HPCN
 	bool "Support MPC8641HPCN"
 	select ARCH_MPC8641
+	imply SCSI
 
 config TARGET_XPEDITE517X
 	bool "Support xpedite517x"

+ 1 - 0
board/congatec/Kconfig

@@ -13,6 +13,7 @@ choice
 config TARGET_CONGA_QEVAL20_QA3_E3845
 	bool "congatec QEVAL 2.0 & conga-QA3/E3845"
 	select BOARD_LATE_INIT
+	imply SCSI
 	help
 	  This is the congatec Qseven 2.0 evaluation carrier board
 	  (conga-QEVAL) equipped with the conga-QA3/E3845-4G SoM.

+ 1 - 0
board/dfi/Kconfig

@@ -12,6 +12,7 @@ choice
 
 config TARGET_DFI_BT700
 	bool "DFI BT700 BayTrail"
+	imply SCSI
 	help
 	  This is the DFI Q7X-151 baseboard equipped with the
 	  DFI BayTrail Bt700 SoM. It contains an Atom E3845 with

+ 1 - 0
configs/A10-OLinuXino-Lime_defconfig

@@ -18,6 +18,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800

+ 1 - 0
configs/A20-OLinuXino-Lime2_defconfig

@@ -20,6 +20,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_SCSI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y

+ 1 - 0
configs/A20-OLinuXino-Lime_defconfig

@@ -16,6 +16,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800

+ 1 - 0
configs/A20-OLinuXino_MICRO_defconfig

@@ -19,6 +19,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800

+ 1 - 0
configs/A20-Olimex-SOM-EVB_defconfig

@@ -20,6 +20,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/Bananapi_M2_Ultra_defconfig

@@ -14,5 +14,6 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SCSI=y
 CONFIG_AXP_DLDO4_VOLT=2500
 CONFIG_AXP_ELDO3_VOLT=1200

+ 1 - 0
configs/Bananapi_defconfig

@@ -17,6 +17,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_NETCONSOLE=y
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/Bananapro_defconfig

@@ -19,6 +19,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_NETCONSOLE=y
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/Cubieboard2_defconfig

@@ -15,6 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/Cubieboard_defconfig

@@ -15,5 +15,6 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/Cubietruck_defconfig

@@ -22,6 +22,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_SCSI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y

+ 1 - 0
configs/Itead_Ibox_A20_defconfig

@@ -15,6 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/Lamobo_R1_defconfig

@@ -17,6 +17,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/Linksprite_pcDuino3_Nano_defconfig

@@ -17,6 +17,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/Linksprite_pcDuino3_defconfig

@@ -15,6 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/MPC8544DS_defconfig

@@ -15,6 +15,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
+CONFIG_SCSI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NETDEVICES=y

+ 1 - 0
configs/MPC8610HPCD_defconfig

@@ -15,6 +15,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y

+ 1 - 0
configs/Marsboard_A10_defconfig

@@ -11,6 +11,7 @@ CONFIG_SPL=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_SUNXI_NO_PMIC=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/Mele_A1000_defconfig

@@ -15,5 +15,6 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/Mele_M5_defconfig

@@ -16,6 +16,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/Orangepi_defconfig

@@ -19,6 +19,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/Orangepi_mini_defconfig

@@ -21,6 +21,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/Wits_Pro_A20_DKT_defconfig

@@ -19,6 +19,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

+ 1 - 0
configs/bayleybay_defconfig

@@ -46,6 +46,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 CONFIG_MMC_PCI=y

+ 1 - 0
configs/chromebook_link64_defconfig

@@ -57,6 +57,7 @@ CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y

+ 1 - 0
configs/chromebook_link_defconfig

@@ -40,6 +40,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y

+ 1 - 0
configs/chromebook_samus_defconfig

@@ -40,6 +40,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_INTEL_BROADWELL_GPIO=y
 CONFIG_CROS_EC=y

+ 1 - 0
configs/chromebox_panther_defconfig

@@ -36,6 +36,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
 CONFIG_SPI_FLASH=y

+ 1 - 0
configs/cm_t54_defconfig

@@ -38,6 +38,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_SCSI=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

+ 1 - 0
configs/controlcenterdc_defconfig

@@ -34,6 +34,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_BOARD_FIXUP=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y

+ 1 - 0
configs/cougarcanyon2_defconfig

@@ -29,6 +29,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_PCI=y

+ 1 - 0
configs/crownbay_defconfig

@@ -35,6 +35,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 CONFIG_MMC_PCI=y

+ 1 - 0
configs/db-88f6820-gp_defconfig

@@ -37,6 +37,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y

+ 1 - 0
configs/highbank_defconfig

@@ -23,5 +23,6 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_SCSI=y
 # CONFIG_MMC is not set
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/ls1012aqds_qspi_defconfig

@@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
+CONFIG_SCSI=y
 CONFIG_DM_MMC=y
 # CONFIG_DM_MMC_OPS is not set
 CONFIG_DM_SPI_FLASH=y

+ 1 - 0
configs/ls2081ardb_defconfig

@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_NETDEVICES=y

+ 1 - 0
configs/minnowmax_defconfig

@@ -47,6 +47,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_MMC=y
 CONFIG_MMC_PCI=y

+ 1 - 0
configs/omap5_uevm_defconfig

@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
+CONFIG_SCSI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_MMC_OMAP_HS=y

+ 1 - 0
configs/som-db5800-som-6867_defconfig

@@ -43,6 +43,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
+CONFIG_SCSI=y
 CONFIG_CPU=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y

+ 1 - 0
configs/xilinx_zynqmp_ep_defconfig

@@ -46,6 +46,7 @@ CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y

+ 1 - 0
configs/xilinx_zynqmp_zcu102_defconfig

@@ -39,6 +39,7 @@ CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y

+ 1 - 0
configs/xilinx_zynqmp_zcu102_revB_defconfig

@@ -39,6 +39,7 @@ CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y

+ 9 - 0
drivers/block/Kconfig

@@ -19,6 +19,15 @@ config AHCI
 	  operations at present. The block device interface has not been converted
 	  to driver model.
 
+config SCSI
+	bool "Support SCSI controllers"
+	help
+	  This enables support for SCSI (Small Computer System Interface),
+	  a parallel interface widely used with storage peripherals such as
+	  hard drives and optical drives. The SCSI standards define physical
+	  interfaces as well as protocols for controlling devices and
+	  tranferring data.
+
 config DM_SCSI
 	bool "Support SCSI controllers with driver model"
 	depends on BLK

+ 0 - 1
include/config_cmd_all.h

@@ -25,7 +25,6 @@
 #define CONFIG_CMD_READ		/* Read data from partition	*/
 #define CONFIG_CMD_SANDBOX	/* sb command to access sandbox features */
 #define CONFIG_CMD_SAVES	/* save S record dump		*/
-#define CONFIG_SCSI		/* SCSI Support			*/
 #define CONFIG_CMD_SDRAM	/* SDRAM DIMM SPD info printout */
 #define CONFIG_CMD_TERMINAL	/* built-in Serial Terminal	*/
 #define CONFIG_CMD_UBIFS	/* UBIFS Support		*/

+ 0 - 1
include/configs/MPC8544DS.h

@@ -352,7 +352,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_PCI)
     #define CONFIG_CMD_PCI
-    #define CONFIG_SCSI
 #endif
 
 /*

+ 0 - 1
include/configs/MPC8572DS.h

@@ -551,7 +551,6 @@
 
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
-#define CONFIG_SCSI
 #endif
 
 /*

+ 0 - 1
include/configs/MPC8610HPCD.h

@@ -430,7 +430,6 @@
 
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
-#define CONFIG_SCSI
 #endif
 
 #define CONFIG_WATCHDOG			/* watchdog enabled */

+ 0 - 1
include/configs/MPC8641HPCN.h

@@ -591,7 +591,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_PCI)
     #define CONFIG_CMD_PCI
-    #define CONFIG_SCSI
 #endif
 
 #undef CONFIG_WATCHDOG			/* watchdog disabled */

+ 0 - 1
include/configs/am57xx_evm.h

@@ -99,7 +99,6 @@
 #define CONFIG_OMAP_USB3PHY1_HOST
 
 /* SATA */
-#define CONFIG_SCSI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

+ 0 - 1
include/configs/cm_t54.h

@@ -49,7 +49,6 @@
 #define CONFIG_SPL_SATA_BOOT_DEVICE		0
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
 
-#define CONFIG_SCSI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

+ 0 - 1
include/configs/controlcenterdc.h

@@ -51,7 +51,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2

+ 0 - 1
include/configs/db-88f6820-gp.h

@@ -25,7 +25,6 @@
  * Commands configuration
  */
 #define CONFIG_CMD_PCI
-#define CONFIG_SCSI
 
 /* I2C */
 #define CONFIG_SYS_I2C

+ 0 - 1
include/configs/dra7xx_evm.h

@@ -162,7 +162,6 @@
 #define CONFIG_OMAP_USB2PHY2_HOST
 
 /* SATA */
-#define CONFIG_SCSI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

+ 0 - 1
include/configs/efi-x86.h

@@ -16,7 +16,6 @@
 #undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_NOWHERE
 #undef CONFIG_SCSI_AHCI
-#undef CONFIG_SCSI
 #undef CONFIG_INTEL_ICH6_GPIO
 #undef CONFIG_USB_EHCI_PCI
 

+ 0 - 1
include/configs/galileo.h

@@ -24,7 +24,6 @@
 
 /* SATA is not supported in Quark SoC */
 #undef CONFIG_SCSI_AHCI
-#undef CONFIG_SCSI
 
 /* 10/100M Ethernet support */
 #define CONFIG_DESIGNWARE_ETH

+ 0 - 1
include/configs/highbank.h

@@ -46,7 +46,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_SCSI
 
 #define CONFIG_BOOT_RETRY_TIME		-1
 #define CONFIG_RESET_TO_RETRY

+ 0 - 1
include/configs/ls1012aqds.h

@@ -135,7 +135,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define	CONFIG_SCSI
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_CMD_SCSI

+ 0 - 1
include/configs/ls1012ardb.h

@@ -51,7 +51,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define	CONFIG_SCSI
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_CMD_SCSI

+ 0 - 1
include/configs/ls1043aqds.h

@@ -98,7 +98,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_SCSI
 
 /* EEPROM */
 #define CONFIG_ID_EEPROM

+ 0 - 1
include/configs/ls1046aqds.h

@@ -153,7 +153,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_SCSI
 
 /* EEPROM */
 #define CONFIG_ID_EEPROM

+ 0 - 1
include/configs/ls1046ardb.h

@@ -233,7 +233,6 @@
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_SCSI
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
 

+ 0 - 1
include/configs/ls2080aqds.h

@@ -50,7 +50,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_SCSI
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
 #define CONFIG_SYS_SATA2			AHCI_BASE_ADDR2

+ 0 - 1
include/configs/ls2080ardb.h

@@ -68,7 +68,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_SCSI
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
 #define CONFIG_SYS_SATA2			AHCI_BASE_ADDR2

+ 0 - 1
include/configs/mvebu_armada-37xx.h

@@ -113,7 +113,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_SCSI
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA

+ 0 - 1
include/configs/mvebu_armada-8k.h

@@ -119,7 +119,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_SCSI
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA

+ 0 - 1
include/configs/omap5_uevm.h

@@ -66,7 +66,6 @@
 
 #define CONSOLEDEV		"ttyO2"
 
-#define CONFIG_SCSI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

+ 0 - 1
include/configs/qemu-x86.h

@@ -39,7 +39,6 @@
 #define CONFIG_ATAPI
 
 #undef CONFIG_SCSI_AHCI
-#undef CONFIG_SCSI
 #else
 #define CONFIG_SCSI_DEV_LIST		\
 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_AHCI}

+ 0 - 1
include/configs/sandbox.h

@@ -157,7 +157,6 @@
 #define CONFIG_SYS_ATA_STRIDE		4
 #endif
 
-#define CONFIG_SCSI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_DEVICE	2
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	8

+ 0 - 1
include/configs/sunxi-common.h

@@ -122,7 +122,6 @@
 #define CONFIG_SYS_SCSI_MAX_LUN		1
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 					 CONFIG_SYS_SCSI_MAX_LUN)
-#define CONFIG_SCSI
 #endif
 
 #define CONFIG_SETUP_MEMORY_TAGS

+ 0 - 1
include/configs/x86-common.h

@@ -71,7 +71,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_PCI
-#define CONFIG_SCSI
 
 #define CONFIG_CMD_ZBOOT
 

+ 0 - 1
include/configs/xilinx_zynqmp.h

@@ -190,7 +190,6 @@
 #define CONFIG_SYS_SCSI_MAX_LUN		1
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 					 CONFIG_SYS_SCSI_MAX_LUN)
-#define CONFIG_SCSI
 #endif
 
 #define CONFIG_SYS_BOOTM_LEN	(60 * 1024 * 1024)

+ 0 - 1
scripts/config_whitelist.txt

@@ -2039,7 +2039,6 @@ CONFIG_SCIF_A
 CONFIG_SCIF_CONSOLE
 CONFIG_SCIF_EXT_CLOCK
 CONFIG_SCIF_USE_EXT_CLK
-CONFIG_SCSI
 CONFIG_SCSI_AHCI
 CONFIG_SCSI_AHCI_PLAT
 CONFIG_SCSI_DEV_ID