Commit 9fd95ef0d39819fb27441fdd0f1b15b05d9b5085

Authored by Tuomas Tynkkynen
Committed by Tom Rini
1 parent 477b16a798

ata: Migrate CONFIG_SCSI_AHCI to Kconfig

And use 'imply' liberally.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>

Showing 101 changed files with 74 additions and 41 deletions Side-by-side Diff

... ... @@ -850,6 +850,7 @@
850 850 select SUPPORT_SPL
851 851 select ARCH_MISC_INIT
852 852 imply SCSI
  853 + imply SCSI_AHCI
853 854 help
854 855 Support for Freescale LS2080AQDS platform
855 856 The LS2080A Development System (QDS) is a high-performance
... ... @@ -865,6 +866,7 @@
865 866 select SUPPORT_SPL
866 867 select ARCH_MISC_INIT
867 868 imply SCSI
  869 + imply SCSI_AHCI
868 870 help
869 871 Support for Freescale LS2080ARDB platform.
870 872 The LS2080A Reference design board (RDB) is a high-performance
... ... @@ -926,6 +928,7 @@
926 928 select ARM64
927 929 select BOARD_LATE_INIT
928 930 imply SCSI
  931 + imply SCSI_AHCI
929 932 help
930 933 Support for Freescale LS1012ARDB platform.
931 934 The LS1012A Reference design board (RDB) is a high-performance
arch/arm/cpu/armv7/ls102xa/Kconfig
... ... @@ -20,6 +20,7 @@
20 20 select SYS_FSL_SEC_COMPAT_5
21 21 select SYS_FSL_SEC_LE
22 22 imply SCSI
  23 + imply SCSI_AHCI
23 24 imply CMD_PCI
24 25  
25 26 menu "LS102xA architecture"
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
... ... @@ -35,6 +35,7 @@
35 35 select ARCH_EARLY_INIT_R
36 36 select BOARD_EARLY_INIT_F
37 37 imply SCSI
  38 + imply SCSI_AHCI
38 39 imply CMD_PCI
39 40  
40 41 config ARCH_LS1046A
... ... @@ -61,6 +62,7 @@
61 62 select ARCH_EARLY_INIT_R
62 63 select BOARD_EARLY_INIT_F
63 64 imply SCSI
  65 + imply SCSI_AHCI
64 66  
65 67 config ARCH_LS1088A
66 68 bool
arch/arm/include/asm/arch-ls102xa/config.h
... ... @@ -81,7 +81,6 @@
81 81 /* SATA */
82 82 #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000)
83 83 #define CONFIG_LIBATA
84   -#define CONFIG_SCSI_AHCI
85 84 #define CONFIG_SCSI_AHCI_PLAT
86 85 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
87 86 #define CONFIG_SYS_SCSI_MAX_LUN 1
arch/x86/cpu/baytrail/Kconfig
... ... @@ -19,6 +19,7 @@
19 19 imply MMC_SDHCI
20 20 imply MMC_SDHCI_SDMA
21 21 imply SCSI
  22 + imply SCSI_AHCI
22 23 imply SPI_FLASH
23 24 imply SYS_NS16550
24 25 imply USB
arch/x86/cpu/braswell/Kconfig
... ... @@ -19,6 +19,7 @@
19 19 imply MMC_SDHCI
20 20 imply MMC_SDHCI_SDMA
21 21 imply SCSI
  22 + imply SCSI_AHCI
22 23 imply SPI_FLASH
23 24 imply SYS_NS16550
24 25 imply USB
arch/x86/cpu/broadwell/Kconfig
... ... @@ -13,6 +13,7 @@
13 13 imply ICH_SPI
14 14 imply INTEL_BROADWELL_GPIO
15 15 imply SCSI
  16 + imply SCSI_AHCI
16 17 imply SPI_FLASH
17 18 imply USB
18 19 imply USB_EHCI_HCD
arch/x86/cpu/coreboot/Kconfig
... ... @@ -10,6 +10,7 @@
10 10 imply MMC_PCI
11 11 imply MMC_SDHCI
12 12 imply MMC_SDHCI_SDMA
  13 + imply SCSI_AHCI
13 14 imply SPI_FLASH
14 15 imply SYS_NS16550
15 16 imply USB
arch/x86/cpu/ivybridge/Kconfig
... ... @@ -14,6 +14,7 @@
14 14 imply ICH_SPI
15 15 imply INTEL_ICH6_GPIO
16 16 imply SCSI
  17 + imply SCSI_AHCI
17 18 imply SPI_FLASH
18 19 imply USB
19 20 imply USB_EHCI_HCD
arch/x86/cpu/qemu/Kconfig
... ... @@ -9,6 +9,7 @@
9 9 select ARCH_EARLY_INIT_R
10 10 imply AHCI_PCI
11 11 imply E1000
  12 + imply SCSI_AHCI
12 13 imply SYS_NS16550
13 14 imply USB
14 15 imply USB_EHCI_HCD
arch/x86/cpu/queensbay/Kconfig
... ... @@ -18,6 +18,7 @@
18 18 imply MMC_SDHCI_SDMA
19 19 imply PCH_GBE
20 20 imply SCSI
  21 + imply SCSI_AHCI
21 22 imply SPI_FLASH
22 23 imply SYS_NS16550
23 24 imply USB
configs/A10-OLinuXino-Lime_defconfig
... ... @@ -17,6 +17,7 @@
17 17 # CONFIG_SPL_DOS_PARTITION is not set
18 18 # CONFIG_SPL_ISO_PARTITION is not set
19 19 # CONFIG_SPL_EFI_PARTITION is not set
  20 +CONFIG_SCSI_AHCI=y
20 21 CONFIG_SUN4I_EMAC=y
21 22 CONFIG_AXP_ALDO3_VOLT=2800
22 23 CONFIG_AXP_ALDO4_VOLT=2800
configs/A20-OLinuXino-Lime2-eMMC_defconfig
... ... @@ -21,6 +21,7 @@
21 21 # CONFIG_SPL_DOS_PARTITION is not set
22 22 # CONFIG_SPL_ISO_PARTITION is not set
23 23 # CONFIG_SPL_PARTITION_UUIDS is not set
  24 +CONFIG_SCSI_AHCI=y
24 25 CONFIG_DFU_RAM=y
25 26 CONFIG_ETH_DESIGNWARE=y
26 27 CONFIG_RGMII=y
configs/A20-OLinuXino-Lime2_defconfig
... ... @@ -20,6 +20,7 @@
20 20 # CONFIG_SPL_DOS_PARTITION is not set
21 21 # CONFIG_SPL_ISO_PARTITION is not set
22 22 # CONFIG_SPL_PARTITION_UUIDS is not set
  23 +CONFIG_SCSI_AHCI=y
23 24 CONFIG_DFU_RAM=y
24 25 CONFIG_ETH_DESIGNWARE=y
25 26 CONFIG_RGMII=y
configs/A20-OLinuXino-Lime_defconfig
... ... @@ -15,6 +15,7 @@
15 15 # CONFIG_SPL_DOS_PARTITION is not set
16 16 # CONFIG_SPL_ISO_PARTITION is not set
17 17 # CONFIG_SPL_EFI_PARTITION is not set
  18 +CONFIG_SCSI_AHCI=y
18 19 CONFIG_ETH_DESIGNWARE=y
19 20 CONFIG_SUN7I_GMAC=y
20 21 CONFIG_AXP_ALDO3_VOLT=2800
configs/A20-OLinuXino_MICRO-eMMC_defconfig
... ... @@ -17,6 +17,7 @@
17 17 # CONFIG_SPL_DOS_PARTITION is not set
18 18 # CONFIG_SPL_ISO_PARTITION is not set
19 19 # CONFIG_SPL_EFI_PARTITION is not set
  20 +CONFIG_SCSI_AHCI=y
20 21 CONFIG_ETH_DESIGNWARE=y
21 22 CONFIG_SUN7I_GMAC=y
22 23 CONFIG_AXP_ALDO3_VOLT=2800
configs/A20-OLinuXino_MICRO_defconfig
... ... @@ -18,6 +18,7 @@
18 18 # CONFIG_SPL_DOS_PARTITION is not set
19 19 # CONFIG_SPL_ISO_PARTITION is not set
20 20 # CONFIG_SPL_EFI_PARTITION is not set
  21 +CONFIG_SCSI_AHCI=y
21 22 CONFIG_ETH_DESIGNWARE=y
22 23 CONFIG_SUN7I_GMAC=y
23 24 CONFIG_AXP_ALDO3_VOLT=2800
configs/A20-Olimex-SOM-EVB_defconfig
... ... @@ -19,6 +19,7 @@
19 19 # CONFIG_SPL_DOS_PARTITION is not set
20 20 # CONFIG_SPL_ISO_PARTITION is not set
21 21 # CONFIG_SPL_EFI_PARTITION is not set
  22 +CONFIG_SCSI_AHCI=y
22 23 CONFIG_ETH_DESIGNWARE=y
23 24 CONFIG_RGMII=y
24 25 CONFIG_SUN7I_GMAC=y
configs/Bananapi_M2_Ultra_defconfig
... ... @@ -13,6 +13,7 @@
13 13 CONFIG_SPL_I2C_SUPPORT=y
14 14 # CONFIG_CMD_FLASH is not set
15 15 # CONFIG_CMD_FPGA is not set
  16 +CONFIG_SCSI_AHCI=y
16 17 CONFIG_AXP_DLDO4_VOLT=2500
17 18 CONFIG_AXP_ELDO3_VOLT=1200
18 19 CONFIG_SCSI=y
configs/Bananapi_defconfig
... ... @@ -16,6 +16,7 @@
16 16 # CONFIG_SPL_ISO_PARTITION is not set
17 17 # CONFIG_SPL_EFI_PARTITION is not set
18 18 CONFIG_NETCONSOLE=y
  19 +CONFIG_SCSI_AHCI=y
19 20 CONFIG_ETH_DESIGNWARE=y
20 21 CONFIG_RGMII=y
21 22 CONFIG_SUN7I_GMAC=y
configs/Bananapro_defconfig
... ... @@ -18,6 +18,7 @@
18 18 # CONFIG_SPL_ISO_PARTITION is not set
19 19 # CONFIG_SPL_EFI_PARTITION is not set
20 20 CONFIG_NETCONSOLE=y
  21 +CONFIG_SCSI_AHCI=y
21 22 CONFIG_ETH_DESIGNWARE=y
22 23 CONFIG_RGMII=y
23 24 CONFIG_SUN7I_GMAC=y
configs/Cubieboard2_defconfig
... ... @@ -14,6 +14,7 @@
14 14 # CONFIG_SPL_DOS_PARTITION is not set
15 15 # CONFIG_SPL_ISO_PARTITION is not set
16 16 # CONFIG_SPL_EFI_PARTITION is not set
  17 +CONFIG_SCSI_AHCI=y
17 18 CONFIG_ETH_DESIGNWARE=y
18 19 CONFIG_SUN7I_GMAC=y
19 20 CONFIG_SCSI=y
configs/Cubieboard_defconfig
... ... @@ -14,6 +14,7 @@
14 14 # CONFIG_SPL_DOS_PARTITION is not set
15 15 # CONFIG_SPL_ISO_PARTITION is not set
16 16 # CONFIG_SPL_EFI_PARTITION is not set
  17 +CONFIG_SCSI_AHCI=y
17 18 CONFIG_SUN4I_EMAC=y
18 19 CONFIG_SCSI=y
19 20 CONFIG_USB_EHCI_HCD=y
configs/Cubietruck_defconfig
... ... @@ -22,6 +22,7 @@
22 22 # CONFIG_SPL_DOS_PARTITION is not set
23 23 # CONFIG_SPL_ISO_PARTITION is not set
24 24 # CONFIG_SPL_PARTITION_UUIDS is not set
  25 +CONFIG_SCSI_AHCI=y
25 26 CONFIG_DFU_RAM=y
26 27 CONFIG_ETH_DESIGNWARE=y
27 28 CONFIG_RGMII=y
configs/Itead_Ibox_A20_defconfig
... ... @@ -14,6 +14,7 @@
14 14 # CONFIG_SPL_DOS_PARTITION is not set
15 15 # CONFIG_SPL_ISO_PARTITION is not set
16 16 # CONFIG_SPL_EFI_PARTITION is not set
  17 +CONFIG_SCSI_AHCI=y
17 18 CONFIG_ETH_DESIGNWARE=y
18 19 CONFIG_SUN7I_GMAC=y
19 20 CONFIG_SCSI=y
configs/Lamobo_R1_defconfig
... ... @@ -16,6 +16,7 @@
16 16 # CONFIG_SPL_DOS_PARTITION is not set
17 17 # CONFIG_SPL_ISO_PARTITION is not set
18 18 # CONFIG_SPL_EFI_PARTITION is not set
  19 +CONFIG_SCSI_AHCI=y
19 20 CONFIG_ETH_DESIGNWARE=y
20 21 CONFIG_RGMII=y
21 22 CONFIG_SUN7I_GMAC=y
configs/Linksprite_pcDuino3_Nano_defconfig
... ... @@ -16,6 +16,7 @@
16 16 # CONFIG_SPL_DOS_PARTITION is not set
17 17 # CONFIG_SPL_ISO_PARTITION is not set
18 18 # CONFIG_SPL_EFI_PARTITION is not set
  19 +CONFIG_SCSI_AHCI=y
19 20 CONFIG_ETH_DESIGNWARE=y
20 21 CONFIG_RGMII=y
21 22 CONFIG_SUN7I_GMAC=y
configs/Linksprite_pcDuino3_defconfig
... ... @@ -14,6 +14,7 @@
14 14 # CONFIG_SPL_DOS_PARTITION is not set
15 15 # CONFIG_SPL_ISO_PARTITION is not set
16 16 # CONFIG_SPL_EFI_PARTITION is not set
  17 +CONFIG_SCSI_AHCI=y
17 18 CONFIG_DM_MMC=y
18 19 CONFIG_ETH_DESIGNWARE=y
19 20 CONFIG_SUN7I_GMAC=y
configs/MPC8544DS_defconfig
... ... @@ -18,6 +18,7 @@
18 18 # CONFIG_CMD_HASH is not set
19 19 CONFIG_CMD_EXT2=y
20 20 CONFIG_ENV_IS_IN_FLASH=y
  21 +CONFIG_SCSI_AHCI=y
21 22 # CONFIG_MMC is not set
22 23 CONFIG_MTD_NOR_FLASH=y
23 24 CONFIG_PHYLIB=y
configs/MPC8572DS_36BIT_defconfig
... ... @@ -18,6 +18,7 @@
18 18 CONFIG_CMD_PING=y
19 19 # CONFIG_CMD_HASH is not set
20 20 CONFIG_CMD_EXT2=y
  21 +CONFIG_SCSI_AHCI=y
21 22 CONFIG_SYS_FSL_DDR2=y
22 23 # CONFIG_MMC is not set
23 24 CONFIG_MTD_NOR_FLASH=y
configs/MPC8572DS_defconfig
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_CMD_PING=y
18 18 # CONFIG_CMD_HASH is not set
19 19 CONFIG_CMD_EXT2=y
  20 +CONFIG_SCSI_AHCI=y
20 21 CONFIG_SYS_FSL_DDR2=y
21 22 # CONFIG_MMC is not set
22 23 CONFIG_MTD_NOR_FLASH=y
configs/MPC8610HPCD_defconfig
... ... @@ -16,6 +16,7 @@
16 16 CONFIG_CMD_BMP=y
17 17 CONFIG_CMD_EXT2=y
18 18 CONFIG_DOS_PARTITION=y
  19 +CONFIG_SCSI_AHCI=y
19 20 # CONFIG_MMC is not set
20 21 CONFIG_MTD_NOR_FLASH=y
21 22 CONFIG_SCSI=y
configs/MPC8641HPCN_36BIT_defconfig
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_CMD_PING=y
16 16 CONFIG_CMD_EXT2=y
17 17 CONFIG_DOS_PARTITION=y
  18 +CONFIG_SCSI_AHCI=y
18 19 # CONFIG_MMC is not set
19 20 CONFIG_MTD_NOR_FLASH=y
20 21 CONFIG_PHYLIB=y
configs/MPC8641HPCN_defconfig
... ... @@ -15,6 +15,7 @@
15 15 CONFIG_CMD_PING=y
16 16 CONFIG_CMD_EXT2=y
17 17 CONFIG_DOS_PARTITION=y
  18 +CONFIG_SCSI_AHCI=y
18 19 # CONFIG_MMC is not set
19 20 CONFIG_MTD_NOR_FLASH=y
20 21 CONFIG_PHYLIB=y
configs/Marsboard_A10_defconfig
... ... @@ -10,6 +10,7 @@
10 10 # CONFIG_SPL_DOS_PARTITION is not set
11 11 # CONFIG_SPL_ISO_PARTITION is not set
12 12 # CONFIG_SPL_EFI_PARTITION is not set
  13 +CONFIG_SCSI_AHCI=y
13 14 CONFIG_SUN4I_EMAC=y
14 15 CONFIG_SUNXI_NO_PMIC=y
15 16 CONFIG_SCSI=y
configs/Mele_A1000_defconfig
... ... @@ -14,6 +14,7 @@
14 14 # CONFIG_SPL_DOS_PARTITION is not set
15 15 # CONFIG_SPL_ISO_PARTITION is not set
16 16 # CONFIG_SPL_EFI_PARTITION is not set
  17 +CONFIG_SCSI_AHCI=y
17 18 CONFIG_SUN4I_EMAC=y
18 19 CONFIG_SCSI=y
19 20 CONFIG_USB_EHCI_HCD=y
configs/Mele_M5_defconfig
... ... @@ -15,6 +15,7 @@
15 15 # CONFIG_SPL_DOS_PARTITION is not set
16 16 # CONFIG_SPL_ISO_PARTITION is not set
17 17 # CONFIG_SPL_EFI_PARTITION is not set
  18 +CONFIG_SCSI_AHCI=y
18 19 CONFIG_ETH_DESIGNWARE=y
19 20 CONFIG_SUN7I_GMAC=y
20 21 CONFIG_SCSI=y
configs/Orangepi_defconfig
... ... @@ -18,6 +18,7 @@
18 18 # CONFIG_SPL_DOS_PARTITION is not set
19 19 # CONFIG_SPL_ISO_PARTITION is not set
20 20 # CONFIG_SPL_EFI_PARTITION is not set
  21 +CONFIG_SCSI_AHCI=y
21 22 CONFIG_ETH_DESIGNWARE=y
22 23 CONFIG_RGMII=y
23 24 CONFIG_SUN7I_GMAC=y
configs/Orangepi_mini_defconfig
... ... @@ -20,6 +20,7 @@
20 20 # CONFIG_SPL_DOS_PARTITION is not set
21 21 # CONFIG_SPL_ISO_PARTITION is not set
22 22 # CONFIG_SPL_EFI_PARTITION is not set
  23 +CONFIG_SCSI_AHCI=y
23 24 CONFIG_ETH_DESIGNWARE=y
24 25 CONFIG_RGMII=y
25 26 CONFIG_SUN7I_GMAC=y
configs/Wits_Pro_A20_DKT_defconfig
... ... @@ -18,6 +18,7 @@
18 18 # CONFIG_SPL_DOS_PARTITION is not set
19 19 # CONFIG_SPL_ISO_PARTITION is not set
20 20 # CONFIG_SPL_EFI_PARTITION is not set
  21 +CONFIG_SCSI_AHCI=y
21 22 CONFIG_ETH_DESIGNWARE=y
22 23 CONFIG_RGMII=y
23 24 CONFIG_SUN7I_GMAC=y
configs/am57xx_evm_defconfig
... ... @@ -39,6 +39,7 @@
39 39 CONFIG_ENV_IS_IN_MMC=y
40 40 CONFIG_DM=y
41 41 CONFIG_SPL_DM=y
  42 +CONFIG_SCSI_AHCI=y
42 43 # CONFIG_BLK is not set
43 44 CONFIG_DFU_MMC=y
44 45 CONFIG_DFU_RAM=y
configs/am57xx_hs_evm_defconfig
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_ENV_IS_IN_MMC=y
43 43 CONFIG_DM=y
44 44 CONFIG_SPL_DM=y
  45 +CONFIG_SCSI_AHCI=y
45 46 # CONFIG_BLK is not set
46 47 CONFIG_DFU_MMC=y
47 48 CONFIG_DFU_RAM=y
configs/bananapi_m1_plus_defconfig
... ... @@ -16,6 +16,7 @@
16 16 # CONFIG_SPL_ISO_PARTITION is not set
17 17 # CONFIG_SPL_EFI_PARTITION is not set
18 18 CONFIG_NETCONSOLE=y
  19 +CONFIG_SCSI_AHCI=y
19 20 CONFIG_ETH_DESIGNWARE=y
20 21 CONFIG_RGMII=y
21 22 CONFIG_SUN7I_GMAC=y
configs/cl-som-am57x_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_CMD_FS_GENERIC=y
34 34 CONFIG_ISO_PARTITION=y
35 35 CONFIG_ENV_IS_IN_SPI_FLASH=y
  36 +CONFIG_SCSI_AHCI=y
36 37 CONFIG_CMD_PCA953X=y
37 38 CONFIG_LED_STATUS=y
38 39 CONFIG_LED_STATUS_GPIO=y
configs/cm_t54_defconfig
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_ISO_PARTITION=y
39 39 CONFIG_EFI_PARTITION=y
40 40 CONFIG_ENV_IS_IN_MMC=y
  41 +CONFIG_SCSI_AHCI=y
41 42 CONFIG_MMC_OMAP_HS=y
42 43 CONFIG_SCSI=y
43 44 CONFIG_SYS_NS16550=y
configs/controlcenterdc_defconfig
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_OF_BOARD_FIXUP=y
36 36 CONFIG_ENV_IS_IN_SPI_FLASH=y
37 37 CONFIG_SPL_OF_TRANSLATE=y
  38 +CONFIG_SCSI_AHCI=y
38 39 CONFIG_DM_GPIO=y
39 40 CONFIG_DM_PCA953X=y
40 41 CONFIG_DM_I2C=y
configs/db-88f6820-gp_defconfig
... ... @@ -38,6 +38,7 @@
38 38 # CONFIG_SPL_PARTITION_UUIDS is not set
39 39 CONFIG_ENV_IS_IN_SPI_FLASH=y
40 40 CONFIG_SPL_OF_TRANSLATE=y
  41 +CONFIG_SCSI_AHCI=y
41 42 CONFIG_MMC_SDHCI=y
42 43 CONFIG_MMC_SDHCI_SDMA=y
43 44 CONFIG_MMC_SDHCI_MV=y
configs/highbank_defconfig
... ... @@ -23,6 +23,7 @@
23 23 CONFIG_EFI_PARTITION=y
24 24 # CONFIG_PARTITION_UUIDS is not set
25 25 CONFIG_ENV_IS_IN_NVRAM=y
  26 +CONFIG_SCSI_AHCI=y
26 27 # CONFIG_MMC is not set
27 28 CONFIG_SCSI=y
28 29 CONFIG_OF_LIBFDT=y
configs/ls1012aqds_qspi_defconfig
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_ENV_IS_IN_SPI_FLASH=y
35 35 CONFIG_NET_RANDOM_ETHADDR=y
36 36 CONFIG_DM=y
  37 +CONFIG_SCSI_AHCI=y
37 38 # CONFIG_BLK is not set
38 39 CONFIG_DM_MMC=y
39 40 CONFIG_DM_SPI_FLASH=y
configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
... ... @@ -9,6 +9,7 @@
9 9 # CONFIG_SYS_MALLOC_F is not set
10 10 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds"
11 11 CONFIG_DM=y
  12 +CONFIG_SCSI_AHCI=y
12 13 CONFIG_DM_PCI=y
13 14 CONFIG_DM_PCI_COMPAT=y
14 15 CONFIG_DM_SPI=y
configs/ls1088aqds_qspi_defconfig
... ... @@ -21,6 +21,7 @@
21 21 CONFIG_ENV_IS_IN_SPI_FLASH=y
22 22 CONFIG_NET_RANDOM_ETHADDR=y
23 23 CONFIG_DM=y
  24 +CONFIG_SCSI_AHCI=y
24 25 CONFIG_DM_SPI_FLASH=y
25 26 CONFIG_SPI_FLASH=y
26 27 CONFIG_SPI_FLASH_SPANSION=y
configs/ls1088aqds_sdcard_qspi_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_ENV_IS_IN_MMC=y
34 34 CONFIG_NET_RANDOM_ETHADDR=y
35 35 CONFIG_DM=y
  36 +CONFIG_SCSI_AHCI=y
36 37 CONFIG_DM_SPI_FLASH=y
37 38 CONFIG_SPI_FLASH=y
38 39 CONFIG_NETDEVICES=y
configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-rdb"
11 11 CONFIG_DISTRO_DEFAULTS=y
12 12 CONFIG_DM=y
  13 +CONFIG_SCSI_AHCI=y
13 14 CONFIG_DM_PCI=y
14 15 CONFIG_DM_PCI_COMPAT=y
15 16 CONFIG_DM_SPI=y
configs/ls1088ardb_qspi_defconfig
... ... @@ -22,6 +22,7 @@
22 22 CONFIG_ENV_IS_IN_SPI_FLASH=y
23 23 CONFIG_NET_RANDOM_ETHADDR=y
24 24 CONFIG_DM=y
  25 +CONFIG_SCSI_AHCI=y
25 26 CONFIG_DM_SPI_FLASH=y
26 27 CONFIG_SPI_FLASH=y
27 28 CONFIG_SPI_FLASH_SPANSION=y
configs/ls1088ardb_sdcard_qspi_defconfig
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_ENV_IS_IN_MMC=y
35 35 CONFIG_NET_RANDOM_ETHADDR=y
36 36 CONFIG_DM=y
  37 +CONFIG_SCSI_AHCI=y
37 38 CONFIG_DM_SPI_FLASH=y
38 39 CONFIG_SPI_FLASH=y
39 40 CONFIG_NETDEVICES=y
configs/ls2081ardb_defconfig
... ... @@ -25,6 +25,7 @@
25 25 CONFIG_ENV_IS_IN_SPI_FLASH=y
26 26 CONFIG_NET_RANDOM_ETHADDR=y
27 27 CONFIG_DM=y
  28 +CONFIG_SCSI_AHCI=y
28 29 CONFIG_FSL_CAAM=y
29 30 CONFIG_DM_SPI_FLASH=y
30 31 CONFIG_PHYLIB=y
configs/mvebu_db-88f3720_defconfig
... ... @@ -36,6 +36,7 @@
36 36 CONFIG_ISO_PARTITION=y
37 37 CONFIG_EFI_PARTITION=y
38 38 CONFIG_ENV_IS_IN_SPI_FLASH=y
  39 +CONFIG_SCSI_AHCI=y
39 40 CONFIG_BLOCK_CACHE=y
40 41 CONFIG_DM_GPIO=y
41 42 # CONFIG_MVEBU_GPIO is not set
configs/mvebu_db_armada8k_defconfig
... ... @@ -39,6 +39,7 @@
39 39 CONFIG_ISO_PARTITION=y
40 40 CONFIG_EFI_PARTITION=y
41 41 CONFIG_ENV_IS_IN_SPI_FLASH=y
  42 +CONFIG_SCSI_AHCI=y
42 43 CONFIG_BLOCK_CACHE=y
43 44 CONFIG_DM_I2C=y
44 45 CONFIG_SYS_I2C_MVTWSI=y
configs/mvebu_espressobin-88f3720_defconfig
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_ISO_PARTITION=y
36 36 CONFIG_EFI_PARTITION=y
37 37 CONFIG_ENV_IS_IN_SPI_FLASH=y
  38 +CONFIG_SCSI_AHCI=y
38 39 CONFIG_BLOCK_CACHE=y
39 40 CONFIG_DM_I2C=y
40 41 CONFIG_MISC=y
configs/mvebu_mcbin-88f8040_defconfig
... ... @@ -41,6 +41,7 @@
41 41 CONFIG_ISO_PARTITION=y
42 42 CONFIG_EFI_PARTITION=y
43 43 CONFIG_ENV_IS_IN_SPI_FLASH=y
  44 +CONFIG_SCSI_AHCI=y
44 45 CONFIG_BLOCK_CACHE=y
45 46 CONFIG_DM_GPIO=y
46 47 CONFIG_DM_I2C=y
configs/omap5_uevm_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_CMD_FS_GENERIC=y
34 34 CONFIG_ISO_PARTITION=y
35 35 CONFIG_ENV_IS_IN_MMC=y
  36 +CONFIG_SCSI_AHCI=y
36 37 CONFIG_DFU_MMC=y
37 38 CONFIG_DFU_RAM=y
38 39 CONFIG_CMD_TCA642X=y
configs/qemu_arm_defconfig
... ... @@ -8,6 +8,7 @@
8 8 CONFIG_CMD_PCI=y
9 9 CONFIG_CMD_USB=y
10 10 CONFIG_OF_BOARD=y
  11 +CONFIG_SCSI_AHCI=y
11 12 CONFIG_AHCI_PCI=y
12 13 CONFIG_BLK=y
13 14 # CONFIG_MMC is not set
configs/turris_omnia_defconfig
... ... @@ -29,6 +29,7 @@
29 29 # CONFIG_SPL_PARTITION_UUIDS is not set
30 30 CONFIG_ENV_IS_IN_SPI_FLASH=y
31 31 CONFIG_SPL_OF_TRANSLATE=y
  32 +CONFIG_SCSI_AHCI=y
32 33 CONFIG_MISC=y
33 34 CONFIG_ATSHA204A=y
34 35 CONFIG_MMC_SDHCI=y
configs/xilinx_zynqmp_ep_defconfig
... ... @@ -49,6 +49,7 @@
49 49 CONFIG_NET_RANDOM_ETHADDR=y
50 50 CONFIG_SPL_DM=y
51 51 CONFIG_SPL_DM_SEQ_ALIAS=y
  52 +CONFIG_SCSI_AHCI=y
52 53 CONFIG_SATA_CEVA=y
53 54 CONFIG_DFU_RAM=y
54 55 CONFIG_FPGA_XILINX=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_NET_RANDOM_ETHADDR=y
43 43 CONFIG_SPL_DM=y
44 44 CONFIG_SPL_DM_SEQ_ALIAS=y
  45 +CONFIG_SCSI_AHCI=y
45 46 CONFIG_SATA_CEVA=y
46 47 CONFIG_DFU_RAM=y
47 48 CONFIG_FPGA_XILINX=y
configs/xilinx_zynqmp_zcu102_revA_defconfig
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_NET_RANDOM_ETHADDR=y
43 43 CONFIG_SPL_DM=y
44 44 CONFIG_SPL_DM_SEQ_ALIAS=y
  45 +CONFIG_SCSI_AHCI=y
45 46 CONFIG_SATA_CEVA=y
46 47 CONFIG_DFU_RAM=y
47 48 CONFIG_FPGA_XILINX=y
configs/xilinx_zynqmp_zcu102_revB_defconfig
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_NET_RANDOM_ETHADDR=y
43 43 CONFIG_SPL_DM=y
44 44 CONFIG_SPL_DM_SEQ_ALIAS=y
  45 +CONFIG_SCSI_AHCI=y
45 46 CONFIG_SATA_CEVA=y
46 47 CONFIG_DFU_RAM=y
47 48 CONFIG_FPGA_XILINX=y
... ... @@ -20,6 +20,11 @@
20 20  
21 21 See also CMD_SATA which provides command-line support.
22 22  
  23 +config SCSI_AHCI
  24 + bool "Enable SCSI interface to SATA devices"
  25 + help
  26 + Enable this to allow interfacing SATA devices via the SCSI layer.
  27 +
23 28 menu "SATA/SCSI device support"
24 29  
25 30 config AHCI_PCI
include/configs/MPC8544DS.h
... ... @@ -282,7 +282,6 @@
282 282 #endif
283 283  
284 284 #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
285   -#define CONFIG_SCSI_AHCI
286 285  
287 286 #ifdef CONFIG_SCSI_AHCI
288 287 #define CONFIG_LIBATA
include/configs/MPC8572DS.h
... ... @@ -469,7 +469,6 @@
469 469 #endif
470 470  
471 471 #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
472   -#define CONFIG_SCSI_AHCI
473 472  
474 473 #ifdef CONFIG_SCSI_AHCI
475 474 #define CONFIG_LIBATA
include/configs/MPC8610HPCD.h
... ... @@ -281,8 +281,6 @@
281 281 #define PCI_IDSEL_NUMBER 0x0c /* slot0->3(IDSEL)=12->15 */
282 282 #endif
283 283  
284   -#define CONFIG_SCSI_AHCI
285   -
286 284 #ifdef CONFIG_SCSI_AHCI
287 285 #define CONFIG_LIBATA
288 286 #define CONFIG_SATA_ULI5288
include/configs/MPC8641HPCN.h
... ... @@ -373,8 +373,6 @@
373 373  
374 374 #undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
375 375  
376   -#define CONFIG_SCSI_AHCI
377   -
378 376 #ifdef CONFIG_SCSI_AHCI
379 377 #define CONFIG_LIBATA
380 378 #define CONFIG_SATA_ULI5288
include/configs/am57xx_evm.h
... ... @@ -97,7 +97,6 @@
97 97  
98 98 /* SATA */
99 99 #define CONFIG_LIBATA
100   -#define CONFIG_SCSI_AHCI
101 100 #define CONFIG_SCSI_AHCI_PLAT
102 101 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
103 102 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/cl-som-am57x.h
... ... @@ -63,7 +63,6 @@
63 63 #ifndef CONFIG_SPL_BUILD
64 64 /* SATA */
65 65 #define CONFIG_LIBATA
66   -#define CONFIG_SCSI_AHCI
67 66 #define CONFIG_SCSI_AHCI_PLAT
68 67 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
69 68 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/cm_t54.h
... ... @@ -48,7 +48,6 @@
48 48 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1
49 49  
50 50 #define CONFIG_LIBATA
51   -#define CONFIG_SCSI_AHCI
52 51 #define CONFIG_SCSI_AHCI_PLAT
53 52 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
54 53 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/controlcenterdc.h
... ... @@ -49,7 +49,6 @@
49 49 * SATA/SCSI/AHCI configuration
50 50 */
51 51 #define CONFIG_LIBATA
52   -#define CONFIG_SCSI_AHCI
53 52 #define CONFIG_SCSI_AHCI_PLAT
54 53 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2
55 54 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/db-88f6820-gp.h
... ... @@ -45,7 +45,6 @@
45 45 * SATA/SCSI/AHCI configuration
46 46 */
47 47 #define CONFIG_LIBATA
48   -#define CONFIG_SCSI_AHCI
49 48 #define CONFIG_SCSI_AHCI_PLAT
50 49 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2
51 50 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/dra7xx_evm.h
... ... @@ -149,7 +149,6 @@
149 149  
150 150 /* SATA */
151 151 #define CONFIG_LIBATA
152   -#define CONFIG_SCSI_AHCI
153 152 #define CONFIG_SCSI_AHCI_PLAT
154 153 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
155 154 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/efi-x86.h
... ... @@ -11,8 +11,6 @@
11 11  
12 12 #undef CONFIG_TPM_TIS_BASE_ADDRESS
13 13  
14   -#undef CONFIG_SCSI_AHCI
15   -
16 14 #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
17 15 "stdout=vga,serial\0" \
18 16 "stderr=vga,serial\0"
include/configs/galileo.h
... ... @@ -22,9 +22,6 @@
22 22 "stdout=serial\0" \
23 23 "stderr=serial\0"
24 24  
25   -/* SATA is not supported in Quark SoC */
26   -#undef CONFIG_SCSI_AHCI
27   -
28 25 /* 10/100M Ethernet support */
29 26 #define CONFIG_DESIGNWARE_ETH
30 27 #define CONFIG_DW_ALTDESCRIPTOR
include/configs/highbank.h
... ... @@ -34,7 +34,6 @@
34 34  
35 35 #define CONFIG_MISC_INIT_R
36 36 #define CONFIG_LIBATA
37   -#define CONFIG_SCSI_AHCI
38 37 #define CONFIG_SCSI_AHCI_PLAT
39 38 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 5
40 39 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/ls1012aqds.h
... ... @@ -126,7 +126,6 @@
126 126  
127 127 /* SATA */
128 128 #define CONFIG_LIBATA
129   -#define CONFIG_SCSI_AHCI
130 129 #define CONFIG_SCSI_AHCI_PLAT
131 130  
132 131 #define CONFIG_SYS_SATA AHCI_BASE_ADDR
include/configs/ls1012ardb.h
... ... @@ -41,7 +41,6 @@
41 41  
42 42 /* SATA */
43 43 #define CONFIG_LIBATA
44   -#define CONFIG_SCSI_AHCI
45 44 #define CONFIG_SCSI_AHCI_PLAT
46 45  
47 46 #define CONFIG_SYS_SATA AHCI_BASE_ADDR
include/configs/ls1021aiot.h
... ... @@ -128,7 +128,6 @@
128 128  
129 129 /* SATA */
130 130 #define CONFIG_LIBATA
131   -#define CONFIG_SCSI_AHCI
132 131 #define CONFIG_SCSI_AHCI_PLAT
133 132 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
134 133 #define PCI_DEVICE_ID_FREESCALE_AHCI 0x0440
include/configs/ls1043aqds.h
... ... @@ -95,7 +95,6 @@
95 95  
96 96 /* SATA */
97 97 #define CONFIG_LIBATA
98   -#define CONFIG_SCSI_AHCI
99 98 #define CONFIG_SCSI_AHCI_PLAT
100 99  
101 100 /* EEPROM */
include/configs/ls1043ardb.h
... ... @@ -287,7 +287,6 @@
287 287 /* SATA */
288 288 #ifndef SPL_NO_SATA
289 289 #define CONFIG_LIBATA
290   -#define CONFIG_SCSI_AHCI
291 290 #ifndef CONFIG_CMD_EXT2
292 291 #define CONFIG_CMD_EXT2
293 292 #endif
include/configs/ls1046aqds.h
... ... @@ -138,7 +138,6 @@
138 138  
139 139 /* SATA */
140 140 #define CONFIG_LIBATA
141   -#define CONFIG_SCSI_AHCI
142 141 #define CONFIG_SCSI_AHCI_PLAT
143 142  
144 143 /* EEPROM */
include/configs/ls1046ardb.h
... ... @@ -212,7 +212,6 @@
212 212 /* SATA */
213 213 #ifndef SPL_NO_SATA
214 214 #define CONFIG_LIBATA
215   -#define CONFIG_SCSI_AHCI
216 215 #define CONFIG_SCSI_AHCI_PLAT
217 216  
218 217 #define CONFIG_SYS_SATA AHCI_BASE_ADDR
include/configs/ls1088a_common.h
... ... @@ -154,7 +154,6 @@
154 154 /* SATA */
155 155 #ifdef CONFIG_SCSI
156 156 #define CONFIG_LIBATA
157   -#define CONFIG_SCSI_AHCI
158 157 #define CONFIG_SCSI_AHCI_PLAT
159 158 #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1
160 159  
include/configs/ls2080aqds.h
... ... @@ -47,7 +47,6 @@
47 47  
48 48 /* SATA */
49 49 #define CONFIG_LIBATA
50   -#define CONFIG_SCSI_AHCI
51 50 #define CONFIG_SCSI_AHCI_PLAT
52 51  
53 52 #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1
include/configs/ls2080ardb.h
... ... @@ -65,7 +65,6 @@
65 65  
66 66 /* SATA */
67 67 #define CONFIG_LIBATA
68   -#define CONFIG_SCSI_AHCI
69 68 #define CONFIG_SCSI_AHCI_PLAT
70 69  
71 70 #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1
include/configs/mvebu_armada-37xx.h
... ... @@ -96,7 +96,6 @@
96 96 /*
97 97 * SATA/SCSI/AHCI configuration
98 98 */
99   -#define CONFIG_SCSI_AHCI
100 99 #define CONFIG_SCSI_AHCI_PLAT
101 100 #define CONFIG_LIBATA
102 101 #define CONFIG_LBA48
include/configs/mvebu_armada-8k.h
... ... @@ -96,7 +96,6 @@
96 96 /*
97 97 * SATA/SCSI/AHCI configuration
98 98 */
99   -#define CONFIG_SCSI_AHCI
100 99 #define CONFIG_SCSI_AHCI_PLAT
101 100 #define CONFIG_LIBATA
102 101 #define CONFIG_LBA48
include/configs/omap5_uevm.h
... ... @@ -62,7 +62,6 @@
62 62 #define CONSOLEDEV "ttyO2"
63 63  
64 64 #define CONFIG_LIBATA
65   -#define CONFIG_SCSI_AHCI
66 65 #define CONFIG_SCSI_AHCI_PLAT
67 66 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 1
68 67 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/qemu-arm.h
... ... @@ -31,7 +31,6 @@
31 31  
32 32 /* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
33 33 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
34   -#define CONFIG_SCSI_AHCI
35 34 #define CONFIG_LIBATA
36 35  
37 36 /* Environment options */
include/configs/sbc8641d.h
... ... @@ -300,8 +300,6 @@
300 300  
301 301 #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
302 302  
303   -#undef CONFIG_SCSI_AHCI
304   -
305 303 #ifdef CONFIG_SCSI_AHCI
306 304 #define CONFIG_SATA_ULI5288
307 305 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
include/configs/sunxi-common.h
... ... @@ -114,7 +114,6 @@
114 114  
115 115 #ifdef CONFIG_AHCI
116 116 #define CONFIG_LIBATA
117   -#define CONFIG_SCSI_AHCI
118 117 #define CONFIG_SCSI_AHCI_PLAT
119 118 #define CONFIG_SUNXI_AHCI
120 119 #define CONFIG_SYS_64BIT_LBA
include/configs/turris_omnia.h
... ... @@ -54,7 +54,6 @@
54 54 * SATA/SCSI/AHCI configuration
55 55 */
56 56 #define CONFIG_LIBATA
57   -#define CONFIG_SCSI_AHCI
58 57 #define CONFIG_SCSI_AHCI_PLAT
59 58 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2
60 59 #define CONFIG_SYS_SCSI_MAX_LUN 1
include/configs/x86-common.h
... ... @@ -28,8 +28,6 @@
28 28 #define CONFIG_SYS_BOOTM_LEN (16 << 20)
29 29  
30 30 /* SATA AHCI storage */
31   -
32   -#define CONFIG_SCSI_AHCI
33 31 #ifdef CONFIG_SCSI_AHCI
34 32 #define CONFIG_LIBATA
35 33 #define CONFIG_LBA48
include/configs/xilinx_zynqmp.h
... ... @@ -158,7 +158,6 @@
158 158  
159 159 #ifdef CONFIG_SATA_CEVA
160 160 #define CONFIG_LIBATA
161   -#define CONFIG_SCSI_AHCI
162 161 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2
163 162 #define CONFIG_SYS_SCSI_MAX_LUN 1
164 163 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
scripts/config_whitelist.txt
... ... @@ -1910,7 +1910,6 @@
1910 1910 CONFIG_SCIF_A
1911 1911 CONFIG_SCIF_EXT_CLOCK
1912 1912 CONFIG_SCIF_USE_EXT_CLK
1913   -CONFIG_SCSI_AHCI
1914 1913 CONFIG_SCSI_AHCI_PLAT
1915 1914 CONFIG_SCSI_DEV_LIST
1916 1915 CONFIG_SC_TIMER_CLK