[U-Boot] [PATCH 08/10] ata: Migrate CONFIG_SCSI_AHCI to Kconfig

Tuomas Tynkkynen tuomas.tynkkynen at iki.fi
Fri Dec 8 13:36:19 UTC 2017 

And use 'imply' liberally.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen at iki.fi>
---
 arch/arm/Kconfig                              | 3 +++
 arch/arm/cpu/armv7/ls102xa/Kconfig            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig     | 2 ++
 arch/arm/include/asm/arch-ls102xa/config.h    | 1 -
 arch/x86/cpu/baytrail/Kconfig                 | 1 +
 arch/x86/cpu/braswell/Kconfig                 | 1 +
 arch/x86/cpu/broadwell/Kconfig                | 1 +
 arch/x86/cpu/coreboot/Kconfig                 | 1 +
 arch/x86/cpu/ivybridge/Kconfig                | 1 +
 arch/x86/cpu/qemu/Kconfig                     | 1 +
 arch/x86/cpu/queensbay/Kconfig                | 1 +
 configs/A10-OLinuXino-Lime_defconfig          | 1 +
 configs/A20-OLinuXino-Lime2-eMMC_defconfig    | 1 +
 configs/A20-OLinuXino-Lime2_defconfig         | 1 +
 configs/A20-OLinuXino-Lime_defconfig          | 1 +
 configs/A20-OLinuXino_MICRO-eMMC_defconfig    | 1 +
 configs/A20-OLinuXino_MICRO_defconfig         | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig          | 1 +
 configs/Bananapi_M2_Ultra_defconfig           | 1 +
 configs/Bananapi_defconfig                    | 1 +
 configs/Bananapro_defconfig                   | 1 +
 configs/Cubieboard2_defconfig                 | 1 +
 configs/Cubieboard_defconfig                  | 1 +
 configs/Cubietruck_defconfig                  | 1 +
 configs/Itead_Ibox_A20_defconfig              | 1 +
 configs/Lamobo_R1_defconfig                   | 1 +
 configs/Linksprite_pcDuino3_Nano_defconfig    | 1 +
 configs/Linksprite_pcDuino3_defconfig         | 1 +
 configs/MPC8544DS_defconfig                   | 1 +
 configs/MPC8572DS_36BIT_defconfig             | 1 +
 configs/MPC8572DS_defconfig                   | 1 +
 configs/MPC8610HPCD_defconfig                 | 1 +
 configs/MPC8641HPCN_36BIT_defconfig           | 1 +
 configs/MPC8641HPCN_defconfig                 | 1 +
 configs/Marsboard_A10_defconfig               | 1 +
 configs/Mele_A1000_defconfig                  | 1 +
 configs/Mele_M5_defconfig                     | 1 +
 configs/Orangepi_defconfig                    | 1 +
 configs/Orangepi_mini_defconfig               | 1 +
 configs/Wits_Pro_A20_DKT_defconfig            | 1 +
 configs/am57xx_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_defconfig               | 1 +
 configs/bananapi_m1_plus_defconfig            | 1 +
 configs/cl-som-am57x_defconfig                | 1 +
 configs/cm_t54_defconfig                      | 1 +
 configs/controlcenterdc_defconfig             | 1 +
 configs/db-88f6820-gp_defconfig               | 1 +
 configs/highbank_defconfig                    | 1 +
 configs/ls1012aqds_qspi_defconfig             | 1 +
 configs/ls1088aqds_qspi_defconfig             | 1 +
 configs/ls1088aqds_sdcard_qspi_defconfig      | 1 +
 configs/ls1088ardb_qspi_defconfig             | 1 +
 configs/ls1088ardb_sdcard_qspi_defconfig      | 1 +
 configs/ls2081ardb_defconfig                  | 1 +
 configs/mvebu_db-88f3720_defconfig            | 1 +
 configs/mvebu_db_armada8k_defconfig           | 1 +
 configs/mvebu_espressobin-88f3720_defconfig   | 1 +
 configs/mvebu_mcbin-88f8040_defconfig         | 1 +
 configs/omap5_uevm_defconfig                  | 1 +
 configs/qemu_arm_defconfig                    | 1 +
 configs/turris_omnia_defconfig                | 1 +
 configs/xilinx_zynqmp_ep_defconfig            | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig   | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig   | 1 +
 drivers/ata/Kconfig                           | 5 +++++
 include/configs/MPC8544DS.h                   | 1 -
 include/configs/MPC8572DS.h                   | 1 -
 include/configs/MPC8610HPCD.h                 | 2 --
 include/configs/MPC8641HPCN.h                 | 2 --
 include/configs/am57xx_evm.h                  | 1 -
 include/configs/cl-som-am57x.h                | 1 -
 include/configs/cm_t54.h                      | 1 -
 include/configs/controlcenterdc.h             | 1 -
 include/configs/db-88f6820-gp.h               | 1 -
 include/configs/dra7xx_evm.h                  | 1 -
 include/configs/efi-x86.h                     | 2 --
 include/configs/galileo.h                     | 3 ---
 include/configs/highbank.h                    | 1 -
 include/configs/ls1012aqds.h                  | 1 -
 include/configs/ls1012ardb.h                  | 1 -
 include/configs/ls1021aiot.h                  | 1 -
 include/configs/ls1043aqds.h                  | 1 -
 include/configs/ls1043ardb.h                  | 1 -
 include/configs/ls1046aqds.h                  | 1 -
 include/configs/ls1046ardb.h                  | 1 -
 include/configs/ls1088a_common.h              | 1 -
 include/configs/ls2080aqds.h                  | 1 -
 include/configs/ls2080ardb.h                  | 1 -
 include/configs/mvebu_armada-37xx.h           | 1 -
 include/configs/mvebu_armada-8k.h             | 1 -
 include/configs/omap5_uevm.h                  | 1 -
 include/configs/qemu-arm.h                    | 1 -
 include/configs/sbc8641d.h                    | 2 --
 include/configs/sunxi-common.h                | 1 -
 include/configs/turris_omnia.h                | 1 -
 include/configs/x86-common.h                  | 2 --
 include/configs/xilinx_zynqmp.h               | 1 -
 scripts/config_whitelist.txt                  | 1 -
 99 files changed, 72 insertions(+), 41 deletions(-)

diff --git arch/arm/Kconfig arch/arm/Kconfig
index e50ba930a1..73909952d0 100644
--- arch/arm/Kconfig
+++ arch/arm/Kconfig
@@ -850,6 +850,7 @@ config TARGET_LS2080AQDS
 	select SUPPORT_SPL
 	select ARCH_MISC_INIT
 	imply SCSI
+	imply SCSI_AHCI
 	help
 	  Support for Freescale LS2080AQDS platform
 	  The LS2080A Development System (QDS) is a high-performance
@@ -865,6 +866,7 @@ config TARGET_LS2080ARDB
 	select SUPPORT_SPL
 	select ARCH_MISC_INIT
 	imply SCSI
+	imply SCSI_AHCI
 	help
 	  Support for Freescale LS2080ARDB platform.
 	  The LS2080A Reference design board (RDB) is a high-performance
@@ -926,6 +928,7 @@ config TARGET_LS1012ARDB
 	select ARM64
 	select BOARD_LATE_INIT
 	imply SCSI
+	imply SCSI_AHCI
 	help
 	  Support for Freescale LS1012ARDB platform.
 	  The LS1012A Reference design board (RDB) is a high-performance
diff --git arch/arm/cpu/armv7/ls102xa/Kconfig arch/arm/cpu/armv7/ls102xa/Kconfig
index 20e2b1a50a..635358e328 100644
--- arch/arm/cpu/armv7/ls102xa/Kconfig
+++ arch/arm/cpu/armv7/ls102xa/Kconfig
@@ -20,6 +20,7 @@ config ARCH_LS1021A
 	select SYS_FSL_SEC_COMPAT_5
 	select SYS_FSL_SEC_LE
 	imply SCSI
+	imply SCSI_AHCI
 	imply CMD_PCI
 
 menu "LS102xA architecture"
diff --git arch/arm/cpu/armv8/fsl-layerscape/Kconfig arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 5daf79e919..aea71b4f46 100644
--- arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -31,6 +31,7 @@ config ARCH_LS1043A
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
 	imply SCSI
+	imply SCSI_AHCI
 	imply CMD_PCI
 
 config ARCH_LS1046A
@@ -57,6 +58,7 @@ config ARCH_LS1046A
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
 	imply SCSI
+	imply SCSI_AHCI
 
 config ARCH_LS1088A
 	bool
diff --git arch/arm/include/asm/arch-ls102xa/config.h arch/arm/include/asm/arch-ls102xa/config.h
index ff0fc47021..2fbd4ef557 100644
--- arch/arm/include/asm/arch-ls102xa/config.h
+++ arch/arm/include/asm/arch-ls102xa/config.h
@@ -81,7 +81,6 @@
 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git arch/x86/cpu/baytrail/Kconfig arch/x86/cpu/baytrail/Kconfig
index 1d876b1927..f47bedaf8d 100644
--- arch/x86/cpu/baytrail/Kconfig
+++ arch/x86/cpu/baytrail/Kconfig
@@ -19,6 +19,7 @@ config INTEL_BAYTRAIL
 	imply MMC_SDHCI
 	imply MMC_SDHCI_SDMA
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB
diff --git arch/x86/cpu/braswell/Kconfig arch/x86/cpu/braswell/Kconfig
index 31ac279c56..042ad2bf51 100644
--- arch/x86/cpu/braswell/Kconfig
+++ arch/x86/cpu/braswell/Kconfig
@@ -19,6 +19,7 @@ config INTEL_BRASWELL
 	imply MMC_SDHCI
 	imply MMC_SDHCI_SDMA
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB
diff --git arch/x86/cpu/broadwell/Kconfig arch/x86/cpu/broadwell/Kconfig
index bc2dba2bd7..42018dc127 100644
--- arch/x86/cpu/broadwell/Kconfig
+++ arch/x86/cpu/broadwell/Kconfig
@@ -13,6 +13,7 @@ config INTEL_BROADWELL
 	imply ICH_SPI
 	imply INTEL_BROADWELL_GPIO
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply USB
 	imply USB_EHCI_HCD
diff --git arch/x86/cpu/coreboot/Kconfig arch/x86/cpu/coreboot/Kconfig
index 60eb45f9d0..fa3b64f2bb 100644
--- arch/x86/cpu/coreboot/Kconfig
+++ arch/x86/cpu/coreboot/Kconfig
@@ -10,6 +10,7 @@ config SYS_COREBOOT
 	imply MMC_PCI
 	imply MMC_SDHCI
 	imply MMC_SDHCI_SDMA
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB
diff --git arch/x86/cpu/ivybridge/Kconfig arch/x86/cpu/ivybridge/Kconfig
index c214ea0efe..85ea6c91f3 100644
--- arch/x86/cpu/ivybridge/Kconfig
+++ arch/x86/cpu/ivybridge/Kconfig
@@ -14,6 +14,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
 	imply ICH_SPI
 	imply INTEL_ICH6_GPIO
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply USB
 	imply USB_EHCI_HCD
diff --git arch/x86/cpu/qemu/Kconfig arch/x86/cpu/qemu/Kconfig
index 81444f3d9e..0a801aabea 100644
--- arch/x86/cpu/qemu/Kconfig
+++ arch/x86/cpu/qemu/Kconfig
@@ -9,6 +9,7 @@ config QEMU
 	select ARCH_EARLY_INIT_R
 	imply AHCI_PCI
 	imply E1000
+	imply SCSI_AHCI
 	imply SYS_NS16550
 	imply USB
 	imply USB_EHCI_HCD
diff --git arch/x86/cpu/queensbay/Kconfig arch/x86/cpu/queensbay/Kconfig
index 835de85268..460ede00bc 100644
--- arch/x86/cpu/queensbay/Kconfig
+++ arch/x86/cpu/queensbay/Kconfig
@@ -18,6 +18,7 @@ config INTEL_QUEENSBAY
 	imply MMC_SDHCI_SDMA
 	imply PCH_GBE
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB
diff --git configs/A10-OLinuXino-Lime_defconfig configs/A10-OLinuXino-Lime_defconfig
index 30e846cf48..ff1d35bd77 100644
--- configs/A10-OLinuXino-Lime_defconfig
+++ configs/A10-OLinuXino-Lime_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_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800
diff --git configs/A20-OLinuXino-Lime2-eMMC_defconfig configs/A20-OLinuXino-Lime2-eMMC_defconfig
index cd1fa64ecb..97f2e7d345 100644
--- configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -21,6 +21,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_AHCI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
diff --git configs/A20-OLinuXino-Lime2_defconfig configs/A20-OLinuXino-Lime2_defconfig
index 4a90ab695a..2916112f14 100644
--- configs/A20-OLinuXino-Lime2_defconfig
+++ 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_AHCI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
diff --git configs/A20-OLinuXino-Lime_defconfig configs/A20-OLinuXino-Lime_defconfig
index 08b301a483..4d94548a76 100644
--- configs/A20-OLinuXino-Lime_defconfig
+++ configs/A20-OLinuXino-Lime_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800
diff --git configs/A20-OLinuXino_MICRO-eMMC_defconfig configs/A20-OLinuXino_MICRO-eMMC_defconfig
index 2ff2723065..586e6abab0 100644
--- configs/A20-OLinuXino_MICRO-eMMC_defconfig
+++ configs/A20-OLinuXino_MICRO-eMMC_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800
diff --git configs/A20-OLinuXino_MICRO_defconfig configs/A20-OLinuXino_MICRO_defconfig
index 1a0ad5a6d4..4abac45de5 100644
--- configs/A20-OLinuXino_MICRO_defconfig
+++ configs/A20-OLinuXino_MICRO_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800
diff --git configs/A20-Olimex-SOM-EVB_defconfig configs/A20-Olimex-SOM-EVB_defconfig
index ee9415517f..25ddce514b 100644
--- configs/A20-Olimex-SOM-EVB_defconfig
+++ configs/A20-Olimex-SOM-EVB_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/Bananapi_M2_Ultra_defconfig configs/Bananapi_M2_Ultra_defconfig
index 4c2c05c4da..8083510274 100644
--- configs/Bananapi_M2_Ultra_defconfig
+++ configs/Bananapi_M2_Ultra_defconfig
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_AXP_DLDO4_VOLT=2500
 CONFIG_AXP_ELDO3_VOLT=1200
 CONFIG_SCSI=y
diff --git configs/Bananapi_defconfig configs/Bananapi_defconfig
index a5456127e2..5265044809 100644
--- configs/Bananapi_defconfig
+++ configs/Bananapi_defconfig
@@ -16,6 +16,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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/Bananapro_defconfig configs/Bananapro_defconfig
index 5c8e759498..fbf18ae1e1 100644
--- configs/Bananapro_defconfig
+++ configs/Bananapro_defconfig
@@ -18,6 +18,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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/Cubieboard2_defconfig configs/Cubieboard2_defconfig
index ef95ac6a5e..594714ef07 100644
--- configs/Cubieboard2_defconfig
+++ configs/Cubieboard2_defconfig
@@ -14,6 +14,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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_SCSI=y
diff --git configs/Cubieboard_defconfig configs/Cubieboard_defconfig
index c670ab851a..8c1c1334e7 100644
--- configs/Cubieboard_defconfig
+++ configs/Cubieboard_defconfig
@@ -14,6 +14,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_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
diff --git configs/Cubietruck_defconfig configs/Cubietruck_defconfig
index f9f73fdb23..8da593be6a 100644
--- configs/Cubietruck_defconfig
+++ 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_AHCI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
diff --git configs/Itead_Ibox_A20_defconfig configs/Itead_Ibox_A20_defconfig
index 8f7ee1d55f..cd388a9aee 100644
--- configs/Itead_Ibox_A20_defconfig
+++ configs/Itead_Ibox_A20_defconfig
@@ -14,6 +14,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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_SCSI=y
diff --git configs/Lamobo_R1_defconfig configs/Lamobo_R1_defconfig
index 84007ad374..4cc4dc4b16 100644
--- configs/Lamobo_R1_defconfig
+++ configs/Lamobo_R1_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/Linksprite_pcDuino3_Nano_defconfig configs/Linksprite_pcDuino3_Nano_defconfig
index 08749b8f75..13538fafd1 100644
--- configs/Linksprite_pcDuino3_Nano_defconfig
+++ configs/Linksprite_pcDuino3_Nano_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/Linksprite_pcDuino3_defconfig configs/Linksprite_pcDuino3_defconfig
index a54f9de3a6..1392d1f4ac 100644
--- configs/Linksprite_pcDuino3_defconfig
+++ configs/Linksprite_pcDuino3_defconfig
@@ -14,6 +14,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_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/MPC8544DS_defconfig configs/MPC8544DS_defconfig
index 6e30ac45f0..4f9219b7ea 100644
--- configs/MPC8544DS_defconfig
+++ configs/MPC8544DS_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
diff --git configs/MPC8572DS_36BIT_defconfig configs/MPC8572DS_36BIT_defconfig
index bce08d139e..14e2933f5b 100644
--- configs/MPC8572DS_36BIT_defconfig
+++ configs/MPC8572DS_36BIT_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
diff --git configs/MPC8572DS_defconfig configs/MPC8572DS_defconfig
index 9dd7c735d1..86546f068e 100644
--- configs/MPC8572DS_defconfig
+++ configs/MPC8572DS_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
diff --git configs/MPC8610HPCD_defconfig configs/MPC8610HPCD_defconfig
index 40256c8708..cb2e06377d 100644
--- configs/MPC8610HPCD_defconfig
+++ configs/MPC8610HPCD_defconfig
@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SCSI=y
diff --git configs/MPC8641HPCN_36BIT_defconfig configs/MPC8641HPCN_36BIT_defconfig
index d51bdf3b9e..a85ecfb976 100644
--- configs/MPC8641HPCN_36BIT_defconfig
+++ configs/MPC8641HPCN_36BIT_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
diff --git configs/MPC8641HPCN_defconfig configs/MPC8641HPCN_defconfig
index dd2a92b691..72ff192a52 100644
--- configs/MPC8641HPCN_defconfig
+++ configs/MPC8641HPCN_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
diff --git configs/Marsboard_A10_defconfig configs/Marsboard_A10_defconfig
index 8bce411663..e79c3a2245 100644
--- configs/Marsboard_A10_defconfig
+++ configs/Marsboard_A10_defconfig
@@ -10,6 +10,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_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_SUNXI_NO_PMIC=y
 CONFIG_SCSI=y
diff --git configs/Mele_A1000_defconfig configs/Mele_A1000_defconfig
index 24a4aff478..d51ee9d91f 100644
--- configs/Mele_A1000_defconfig
+++ configs/Mele_A1000_defconfig
@@ -14,6 +14,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_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
diff --git configs/Mele_M5_defconfig configs/Mele_M5_defconfig
index 84c83dab2e..b4a1964629 100644
--- configs/Mele_M5_defconfig
+++ configs/Mele_M5_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_SCSI=y
diff --git configs/Orangepi_defconfig configs/Orangepi_defconfig
index d39cc66d85..50dd0fc32c 100644
--- configs/Orangepi_defconfig
+++ configs/Orangepi_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/Orangepi_mini_defconfig configs/Orangepi_mini_defconfig
index 17f825f241..6f3782c105 100644
--- configs/Orangepi_mini_defconfig
+++ configs/Orangepi_mini_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/Wits_Pro_A20_DKT_defconfig configs/Wits_Pro_A20_DKT_defconfig
index 2e96ba2a52..a16e363000 100644
--- configs/Wits_Pro_A20_DKT_defconfig
+++ configs/Wits_Pro_A20_DKT_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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/am57xx_evm_defconfig configs/am57xx_evm_defconfig
index 6e4d04c13b..fc96401d3e 100644
--- configs/am57xx_evm_defconfig
+++ configs/am57xx_evm_defconfig
@@ -39,6 +39,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git configs/am57xx_hs_evm_defconfig configs/am57xx_hs_evm_defconfig
index e36491086f..681e2a54c8 100644
--- configs/am57xx_hs_evm_defconfig
+++ configs/am57xx_hs_evm_defconfig
@@ -42,6 +42,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
diff --git configs/bananapi_m1_plus_defconfig configs/bananapi_m1_plus_defconfig
index 79ff0aaed2..efe15459bc 100644
--- configs/bananapi_m1_plus_defconfig
+++ configs/bananapi_m1_plus_defconfig
@@ -16,6 +16,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_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y
diff --git configs/cl-som-am57x_defconfig configs/cl-som-am57x_defconfig
index 8f0a7f68ce..9c3031bac8 100644
--- configs/cl-som-am57x_defconfig
+++ configs/cl-som-am57x_defconfig
@@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_CMD_PCA953X=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS_GPIO=y
diff --git configs/cm_t54_defconfig configs/cm_t54_defconfig
index 69b1cbfdfe..ca80f18e77 100644
--- configs/cm_t54_defconfig
+++ configs/cm_t54_defconfig
@@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SCSI_AHCI=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
diff --git configs/controlcenterdc_defconfig configs/controlcenterdc_defconfig
index f65e525934..856591e2c8 100644
--- configs/controlcenterdc_defconfig
+++ configs/controlcenterdc_defconfig
@@ -35,6 +35,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_BOARD_FIXUP=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
diff --git configs/db-88f6820-gp_defconfig configs/db-88f6820-gp_defconfig
index beac266189..5cc27813b0 100644
--- configs/db-88f6820-gp_defconfig
+++ configs/db-88f6820-gp_defconfig
@@ -38,6 +38,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y
diff --git configs/highbank_defconfig configs/highbank_defconfig
index 20a7b71737..f55b5dcebd 100644
--- configs/highbank_defconfig
+++ configs/highbank_defconfig
@@ -23,6 +23,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_NVRAM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_SCSI=y
 CONFIG_OF_LIBFDT=y
diff --git configs/ls1012aqds_qspi_defconfig configs/ls1012aqds_qspi_defconfig
index 4073db6583..0435d51dc4 100644
--- configs/ls1012aqds_qspi_defconfig
+++ configs/ls1012aqds_qspi_defconfig
@@ -34,6 +34,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_BLK is not set
 CONFIG_DM_MMC=y
 CONFIG_DM_SPI_FLASH=y
diff --git configs/ls1088aqds_qspi_defconfig configs/ls1088aqds_qspi_defconfig
index 850be3ebc9..1e368d7b6a 100644
--- configs/ls1088aqds_qspi_defconfig
+++ configs/ls1088aqds_qspi_defconfig
@@ -20,6 +20,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
diff --git configs/ls1088aqds_sdcard_qspi_defconfig configs/ls1088aqds_sdcard_qspi_defconfig
index 2313d28a19..0ba698168b 100644
--- configs/ls1088aqds_sdcard_qspi_defconfig
+++ configs/ls1088aqds_sdcard_qspi_defconfig
@@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
diff --git configs/ls1088ardb_qspi_defconfig configs/ls1088ardb_qspi_defconfig
index 599ee15968..044e00d385 100644
--- configs/ls1088ardb_qspi_defconfig
+++ configs/ls1088ardb_qspi_defconfig
@@ -18,6 +18,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
diff --git configs/ls1088ardb_sdcard_qspi_defconfig configs/ls1088ardb_sdcard_qspi_defconfig
index 14910da72d..b0d354b68e 100644
--- configs/ls1088ardb_sdcard_qspi_defconfig
+++ configs/ls1088ardb_sdcard_qspi_defconfig
@@ -28,6 +28,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
diff --git configs/ls2081ardb_defconfig configs/ls2081ardb_defconfig
index 1ab8f18cd3..e532032840 100644
--- configs/ls2081ardb_defconfig
+++ configs/ls2081ardb_defconfig
@@ -25,6 +25,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
diff --git configs/mvebu_db-88f3720_defconfig configs/mvebu_db-88f3720_defconfig
index 0fd4514c37..283a964f24 100644
--- configs/mvebu_db-88f3720_defconfig
+++ configs/mvebu_db-88f3720_defconfig
@@ -36,6 +36,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_GPIO=y
 # CONFIG_MVEBU_GPIO is not set
diff --git configs/mvebu_db_armada8k_defconfig configs/mvebu_db_armada8k_defconfig
index 2e2e0bcb44..ab949c1952 100644
--- configs/mvebu_db_armada8k_defconfig
+++ configs/mvebu_db_armada8k_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_MVEBU_BUBT=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y
diff --git configs/mvebu_espressobin-88f3720_defconfig configs/mvebu_espressobin-88f3720_defconfig
index 95db6c610e..d99c4f52d9 100644
--- configs/mvebu_espressobin-88f3720_defconfig
+++ configs/mvebu_espressobin-88f3720_defconfig
@@ -35,6 +35,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
diff --git configs/mvebu_mcbin-88f8040_defconfig configs/mvebu_mcbin-88f8040_defconfig
index c0d1881ff8..29f134df1d 100644
--- configs/mvebu_mcbin-88f8040_defconfig
+++ configs/mvebu_mcbin-88f8040_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
diff --git configs/omap5_uevm_defconfig configs/omap5_uevm_defconfig
index acf8962201..b3c6fa9cf1 100644
--- configs/omap5_uevm_defconfig
+++ configs/omap5_uevm_defconfig
@@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_CMD_TCA642X=y
diff --git configs/qemu_arm_defconfig configs/qemu_arm_defconfig
index f353eea691..3cd4d45433 100644
--- configs/qemu_arm_defconfig
+++ configs/qemu_arm_defconfig
@@ -8,6 +8,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_OF_BOARD=y
+CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_BLK=y
 # CONFIG_MMC is not set
diff --git configs/turris_omnia_defconfig configs/turris_omnia_defconfig
index b9b5cbc2c5..ffb26cdac3 100644
--- configs/turris_omnia_defconfig
+++ configs/turris_omnia_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_BTRFS=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_MISC=y
 CONFIG_ATSHA204A=y
 CONFIG_MMC_SDHCI=y
diff --git configs/xilinx_zynqmp_ep_defconfig configs/xilinx_zynqmp_ep_defconfig
index ff865f1bdc..ee9528caec 100644
--- configs/xilinx_zynqmp_ep_defconfig
+++ configs/xilinx_zynqmp_ep_defconfig
@@ -49,6 +49,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
diff --git configs/xilinx_zynqmp_zcu102_rev1_0_defconfig configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
index bf27ca48db..158dc7ed8c 100644
--- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
+++ configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
diff --git configs/xilinx_zynqmp_zcu102_revA_defconfig configs/xilinx_zynqmp_zcu102_revA_defconfig
index 80c5e49348..01e956cbc9 100644
--- configs/xilinx_zynqmp_zcu102_revA_defconfig
+++ configs/xilinx_zynqmp_zcu102_revA_defconfig
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
diff --git configs/xilinx_zynqmp_zcu102_revB_defconfig configs/xilinx_zynqmp_zcu102_revB_defconfig
index 232532c995..ab2f0a830a 100644
--- configs/xilinx_zynqmp_zcu102_revB_defconfig
+++ configs/xilinx_zynqmp_zcu102_revB_defconfig
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y
diff --git drivers/ata/Kconfig drivers/ata/Kconfig
index 25ef5cef02..38318b4615 100644
--- drivers/ata/Kconfig
+++ drivers/ata/Kconfig
@@ -20,6 +20,11 @@ config SATA
 
 	  See also CMD_SATA which provides command-line support.
 
+config SCSI_AHCI
+	bool "Enable SCSI interface to SATA devices"
+	help
+	  Enable this to allow interfacing SATA devices via the SCSI layer.
+
 menu "SATA/SCSI device support"
 
 config AHCI_PCI
diff --git include/configs/MPC8544DS.h include/configs/MPC8544DS.h
index 2aea8928ee..4332941779 100644
--- include/configs/MPC8544DS.h
+++ include/configs/MPC8544DS.h
@@ -282,7 +282,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
diff --git include/configs/MPC8572DS.h include/configs/MPC8572DS.h
index b277cdb1c6..0ad13d2c63 100644
--- include/configs/MPC8572DS.h
+++ include/configs/MPC8572DS.h
@@ -469,7 +469,6 @@
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
diff --git include/configs/MPC8610HPCD.h include/configs/MPC8610HPCD.h
index e7b59a3d65..befd3f776e 100644
--- include/configs/MPC8610HPCD.h
+++ include/configs/MPC8610HPCD.h
@@ -281,8 +281,6 @@
 #define PCI_IDSEL_NUMBER	0x0c	/* slot0->3(IDSEL)=12->15 */
 #endif
 
-#define CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
diff --git include/configs/MPC8641HPCN.h include/configs/MPC8641HPCN.h
index 298fe5a63d..882c4c271b 100644
--- include/configs/MPC8641HPCN.h
+++ include/configs/MPC8641HPCN.h
@@ -373,8 +373,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
-#define CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
diff --git include/configs/am57xx_evm.h include/configs/am57xx_evm.h
index dc05bea05e..2ebe0f50bf 100644
--- include/configs/am57xx_evm.h
+++ include/configs/am57xx_evm.h
@@ -97,7 +97,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/cl-som-am57x.h include/configs/cl-som-am57x.h
index a3b40ab196..7115bb8111 100644
--- include/configs/cl-som-am57x.h
+++ include/configs/cl-som-am57x.h
@@ -63,7 +63,6 @@
 #ifndef CONFIG_SPL_BUILD
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/cm_t54.h include/configs/cm_t54.h
index 9152c71717..f756e77c06 100644
--- include/configs/cm_t54.h
+++ include/configs/cm_t54.h
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
 
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/controlcenterdc.h include/configs/controlcenterdc.h
index 715e9ed9c9..92f3619992 100644
--- include/configs/controlcenterdc.h
+++ include/configs/controlcenterdc.h
@@ -49,7 +49,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/db-88f6820-gp.h include/configs/db-88f6820-gp.h
index 44fd968d3b..672bfbc946 100644
--- include/configs/db-88f6820-gp.h
+++ include/configs/db-88f6820-gp.h
@@ -45,7 +45,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/dra7xx_evm.h include/configs/dra7xx_evm.h
index f84c1f0146..4b622365ae 100644
--- include/configs/dra7xx_evm.h
+++ include/configs/dra7xx_evm.h
@@ -149,7 +149,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/efi-x86.h include/configs/efi-x86.h
index 43935bf4b4..b027615139 100644
--- include/configs/efi-x86.h
+++ include/configs/efi-x86.h
@@ -11,8 +11,6 @@
 
 #undef CONFIG_TPM_TIS_BASE_ADDRESS
 
-#undef CONFIG_SCSI_AHCI
-
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
 					"stdout=vga,serial\0" \
 					"stderr=vga,serial\0"
diff --git include/configs/galileo.h include/configs/galileo.h
index 00c5434125..cf798d07e7 100644
--- include/configs/galileo.h
+++ include/configs/galileo.h
@@ -22,9 +22,6 @@
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
-/* SATA is not supported in Quark SoC */
-#undef CONFIG_SCSI_AHCI
-
 /* 10/100M Ethernet support */
 #define CONFIG_DESIGNWARE_ETH
 #define CONFIG_DW_ALTDESCRIPTOR
diff --git include/configs/highbank.h include/configs/highbank.h
index b2b2c2500a..544e38ff3a 100644
--- include/configs/highbank.h
+++ include/configs/highbank.h
@@ -34,7 +34,6 @@
 
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	5
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/ls1012aqds.h include/configs/ls1012aqds.h
index d15054709e..5410549ce6 100644
--- include/configs/ls1012aqds.h
+++ include/configs/ls1012aqds.h
@@ -126,7 +126,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
diff --git include/configs/ls1012ardb.h include/configs/ls1012ardb.h
index 794117062f..1659fc5a76 100644
--- include/configs/ls1012ardb.h
+++ include/configs/ls1012ardb.h
@@ -41,7 +41,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
diff --git include/configs/ls1021aiot.h include/configs/ls1021aiot.h
index 46bf55f891..cc76c4e5e8 100644
--- include/configs/ls1021aiot.h
+++ include/configs/ls1021aiot.h
@@ -128,7 +128,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440
diff --git include/configs/ls1043aqds.h include/configs/ls1043aqds.h
index 8cc2abb2b6..a63e9f4981 100644
--- include/configs/ls1043aqds.h
+++ include/configs/ls1043aqds.h
@@ -95,7 +95,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* EEPROM */
diff --git include/configs/ls1043ardb.h include/configs/ls1043ardb.h
index b4b4d5e178..9e71e8f430 100644
--- include/configs/ls1043ardb.h
+++ include/configs/ls1043ardb.h
@@ -287,7 +287,6 @@
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #ifndef CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT2
 #endif
diff --git include/configs/ls1046aqds.h include/configs/ls1046aqds.h
index 1713e2c031..74b1c1127b 100644
--- include/configs/ls1046aqds.h
+++ include/configs/ls1046aqds.h
@@ -138,7 +138,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* EEPROM */
diff --git include/configs/ls1046ardb.h include/configs/ls1046ardb.h
index d001b80270..f143a9ea3f 100644
--- include/configs/ls1046ardb.h
+++ include/configs/ls1046ardb.h
@@ -212,7 +212,6 @@
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR
diff --git include/configs/ls1088a_common.h include/configs/ls1088a_common.h
index 6b71d47c5a..602c5745ca 100644
--- include/configs/ls1088a_common.h
+++ include/configs/ls1088a_common.h
@@ -157,7 +157,6 @@ unsigned long long get_qixis_addr(void);
 /* SATA */
 #ifdef CONFIG_SCSI
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SATA1		AHCI_BASE_ADDR1
 
diff --git include/configs/ls2080aqds.h include/configs/ls2080aqds.h
index f1968cc533..0a14cf48cf 100644
--- include/configs/ls2080aqds.h
+++ include/configs/ls2080aqds.h
@@ -47,7 +47,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
diff --git include/configs/ls2080ardb.h include/configs/ls2080ardb.h
index 650db2f594..ab9c4ef8c3 100644
--- include/configs/ls2080ardb.h
+++ include/configs/ls2080ardb.h
@@ -65,7 +65,6 @@ unsigned long get_board_sys_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1
diff --git include/configs/mvebu_armada-37xx.h include/configs/mvebu_armada-37xx.h
index 1b2e0d71b4..52d4944554 100644
--- include/configs/mvebu_armada-37xx.h
+++ include/configs/mvebu_armada-37xx.h
@@ -96,7 +96,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
diff --git include/configs/mvebu_armada-8k.h include/configs/mvebu_armada-8k.h
index d85527434a..c2b2d12678 100644
--- include/configs/mvebu_armada-8k.h
+++ include/configs/mvebu_armada-8k.h
@@ -96,7 +96,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
diff --git include/configs/omap5_uevm.h include/configs/omap5_uevm.h
index 38d7412099..124657f61a 100644
--- include/configs/omap5_uevm.h
+++ include/configs/omap5_uevm.h
@@ -62,7 +62,6 @@
 #define CONSOLEDEV		"ttyO2"
 
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/qemu-arm.h include/configs/qemu-arm.h
index 4376a24787..69e886b43e 100644
--- include/configs/qemu-arm.h
+++ include/configs/qemu-arm.h
@@ -31,7 +31,6 @@
 
 /* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
-#define CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 
 /* Environment options */
diff --git include/configs/sbc8641d.h include/configs/sbc8641d.h
index a0097fdbd9..817c9d920d 100644
--- include/configs/sbc8641d.h
+++ include/configs/sbc8641d.h
@@ -300,8 +300,6 @@
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
-#undef CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
diff --git include/configs/sunxi-common.h include/configs/sunxi-common.h
index 4391a8cbc8..5ffd69664c 100644
--- include/configs/sunxi-common.h
+++ include/configs/sunxi-common.h
@@ -114,7 +114,6 @@
 
 #ifdef CONFIG_AHCI
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SUNXI_AHCI
 #define CONFIG_SYS_64BIT_LBA
diff --git include/configs/turris_omnia.h include/configs/turris_omnia.h
index d2c3e57570..7a7a157bbb 100644
--- include/configs/turris_omnia.h
+++ include/configs/turris_omnia.h
@@ -54,7 +54,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
diff --git include/configs/x86-common.h include/configs/x86-common.h
index 6422852010..5554df9484 100644
--- include/configs/x86-common.h
+++ include/configs/x86-common.h
@@ -28,8 +28,6 @@
 #define CONFIG_SYS_BOOTM_LEN		(16 << 20)
 
 /* SATA AHCI storage */
-
-#define CONFIG_SCSI_AHCI
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
diff --git include/configs/xilinx_zynqmp.h include/configs/xilinx_zynqmp.h
index 14604eb4e8..493e3e30d5 100644
--- include/configs/xilinx_zynqmp.h
+++ include/configs/xilinx_zynqmp.h
@@ -158,7 +158,6 @@
 
 #ifdef CONFIG_SATA_CEVA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt
index 94b758a4dd..67feedfbf2 100644
--- scripts/config_whitelist.txt
+++ scripts/config_whitelist.txt
@@ -1911,7 +1911,6 @@ CONFIG_SCIF
 CONFIG_SCIF_A
 CONFIG_SCIF_EXT_CLOCK
 CONFIG_SCIF_USE_EXT_CLK
-CONFIG_SCSI_AHCI
 CONFIG_SCSI_AHCI_PLAT
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK
-- 
2.15.0

More information about the U-Boot mailing list