diff options
| author | Simon Glass <sjg@chromium.org> | 2022-01-31 07:49:37 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-09 09:16:48 -0500 |
| commit | edca8cf72130c53fe399d1f354937c04efb96c7d (patch) | |
| tree | 89f4ace4cdd21854a8fe035f1f78a0b34c78bf0c | |
| parent | ce30e3ff1e4b5abff5a9936776fe99190d705236 (diff) | |
| download | u-boot-edca8cf72130c53fe399d1f354937c04efb96c7d.tar.gz u-boot-edca8cf72130c53fe399d1f354937c04efb96c7d.tar.bz2 u-boot-edca8cf72130c53fe399d1f354937c04efb96c7d.zip | |
Convert CONFIG_SCSI_AHCI_PLAT et al to Kconfig
This converts the following to Kconfig:
CONFIG_SCSI_AHCI_PLAT
CONFIG_SYS_SCSI_MAX_SCSI_ID
CONFIG_SYS_SCSI_MAX_LUN
CONFIG_SYS_SATA_MAX_DEVICE
Drop CONFIG_SCSI for everything except the sandbox build. We only need
one build for tests.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
140 files changed, 128 insertions, 161 deletions
@@ -732,14 +732,6 @@ The following options need to be configured: When enabled, makes the IDE subsystem use 64bit sector addresses. Default is 32bit. -- SCSI Support: - CONFIG_SYS_SCSI_MAX_LUN [8] and CONFIG_SYS_SCSI_MAX_SCSI_ID [7] - can be adjusted to define the maximum numbers of LUNs and SCSI - IDs. - - The environment variable 'scsidevs' is set to the number of - SCSI devices found during the last scan. - - NETWORK Support (PCI): CONFIG_E1000_SPI Utility code for direct access to the SPI bus on Intel 8257x. diff --git a/arch/Kconfig b/arch/Kconfig index bea8ead561..e6191446a3 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -172,7 +172,6 @@ config SANDBOX imply FIRMWARE imply HASH_VERIFY imply LZMA - imply SCSI imply TEE imply AVB_VERIFY imply LIBAVB diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 489286ed8d..86a4e1f6bf 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -78,9 +78,6 @@ /* SATA */ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000) -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 #ifdef CONFIG_DDR_SPD #define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_LS1_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig index 0c3b6aea14..f875aa886d 100644 --- a/configs/MPC837XERDB_defconfig +++ b/configs/MPC837XERDB_defconfig @@ -171,6 +171,7 @@ CONFIG_ENV_ADDR=0xFE080000 CONFIG_DM=y CONFIG_SATA=y CONFIG_FSL_SATA=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xFE001001 CONFIG_SYS_OR0_PRELIM=0xFF800193 diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig index ef7f24b85f..61fd2a78a4 100644 --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig @@ -54,6 +54,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig index 892a8a6e05..0e537ebb52 100644 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@ -36,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig index 705d0dad62..dc113be28d 100644 --- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig +++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig @@ -48,6 +48,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig index e4ad50fc7b..cd5c80c634 100644 --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig @@ -50,6 +50,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig index b303c4c46c..f80a0d929c 100644 --- a/configs/P1010RDB-PA_NAND_defconfig +++ b/configs/P1010RDB-PA_NAND_defconfig @@ -53,6 +53,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig index 8db09ba2b8..035aac226b 100644 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@ -35,6 +35,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig index f02757dd6b..cd031d218c 100644 --- a/configs/P1010RDB-PA_SDCARD_defconfig +++ b/configs/P1010RDB-PA_SDCARD_defconfig @@ -47,6 +47,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig index 9a09473ad4..f339502637 100644 --- a/configs/P1010RDB-PA_SPIFLASH_defconfig +++ b/configs/P1010RDB-PA_SPIFLASH_defconfig @@ -49,6 +49,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig index 8582868283..ba64f8818f 100644 --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig @@ -55,6 +55,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig index 84173e2d60..a8e9556871 100644 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@ -37,6 +37,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig index 4b0a1ab53b..871996711d 100644 --- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig +++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig @@ -49,6 +49,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig index 986b992e6b..2d646f9f54 100644 --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig @@ -51,6 +51,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig index e4364769f9..f8437ff032 100644 --- a/configs/P1010RDB-PB_NAND_defconfig +++ b/configs/P1010RDB-PB_NAND_defconfig @@ -54,6 +54,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig index 62f4c89270..b99531c4cd 100644 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@ -36,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig index 9cdb3599f7..ebe2af6f4a 100644 --- a/configs/P1010RDB-PB_SDCARD_defconfig +++ b/configs/P1010RDB-PB_SDCARD_defconfig @@ -48,6 +48,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig index 299564c9ca..7893782fa4 100644 --- a/configs/P1010RDB-PB_SPIFLASH_defconfig +++ b/configs/P1010RDB-PB_SPIFLASH_defconfig @@ -50,6 +50,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DM_I2C=y diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig index 9dc72573c1..01d61928a3 100644 --- a/configs/P2041RDB_NAND_defconfig +++ b/configs/P2041RDB_NAND_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xFFA00C21 diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig index 997f461976..dc56c791d1 100644 --- a/configs/P2041RDB_SDCARD_defconfig +++ b/configs/P2041RDB_SDCARD_defconfig @@ -41,6 +41,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xE8001001 diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig index d54d621836..78a24503a4 100644 --- a/configs/P2041RDB_SPIFLASH_defconfig +++ b/configs/P2041RDB_SPIFLASH_defconfig @@ -42,6 +42,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xE8001001 diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig index b2fb18c552..f6bf4daf23 100644 --- a/configs/P2041RDB_defconfig +++ b/configs/P2041RDB_defconfig @@ -37,6 +37,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xE8001001 diff --git a/configs/P3041DS_NAND_defconfig b/configs/P3041DS_NAND_defconfig index 971254ac06..ec5850017d 100644 --- a/configs/P3041DS_NAND_defconfig +++ b/configs/P3041DS_NAND_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/P3041DS_SDCARD_defconfig b/configs/P3041DS_SDCARD_defconfig index 7cf3c2240c..58a3eaea72 100644 --- a/configs/P3041DS_SDCARD_defconfig +++ b/configs/P3041DS_SDCARD_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/P3041DS_SPIFLASH_defconfig b/configs/P3041DS_SPIFLASH_defconfig index 0e810f8ca9..c48976b3d0 100644 --- a/configs/P3041DS_SPIFLASH_defconfig +++ b/configs/P3041DS_SPIFLASH_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig index db1b5fb169..fcc73610af 100644 --- a/configs/P3041DS_defconfig +++ b/configs/P3041DS_defconfig @@ -35,6 +35,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/P5040DS_NAND_defconfig b/configs/P5040DS_NAND_defconfig index 90503b63a2..279976c04d 100644 --- a/configs/P5040DS_NAND_defconfig +++ b/configs/P5040DS_NAND_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/P5040DS_SDCARD_defconfig b/configs/P5040DS_SDCARD_defconfig index 90216f6c7a..34ebc51922 100644 --- a/configs/P5040DS_SDCARD_defconfig +++ b/configs/P5040DS_SDCARD_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/P5040DS_SPIFLASH_defconfig b/configs/P5040DS_SPIFLASH_defconfig index 8b1781268e..ea8b673304 100644 --- a/configs/P5040DS_SPIFLASH_defconfig +++ b/configs/P5040DS_SPIFLASH_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig index 6836fcfe4d..e9bf7ff014 100644 --- a/configs/P5040DS_defconfig +++ b/configs/P5040DS_defconfig @@ -35,6 +35,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig index 521b0cf608..1b6ef8aaa1 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -56,6 +56,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig index eb0b341e5c..8ab1c5d680 100644 --- a/configs/T2080QDS_SDCARD_defconfig +++ b/configs/T2080QDS_SDCARD_defconfig @@ -55,6 +55,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig index 97bfbd951a..a84b7adab0 100644 --- a/configs/T2080QDS_SECURE_BOOT_defconfig +++ b/configs/T2080QDS_SECURE_BOOT_defconfig @@ -40,6 +40,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig index a09d1470a6..8fd024848a 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -57,6 +57,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig index db09d3b92e..f9dbc84f92 100644 --- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig @@ -37,6 +37,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_REMOTE=y CONFIG_ENV_ADDR=0xFFE20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index c036d5dfed..424b3f2cdb 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -40,6 +40,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index 17558d421d..1c55d30b5e 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -60,6 +60,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig index 949976b2af..ea9c479825 100644 --- a/configs/T2080RDB_SDCARD_defconfig +++ b/configs/T2080RDB_SDCARD_defconfig @@ -59,6 +59,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index 66ca339e4d..5e08b82406 100644 --- a/configs/T2080RDB_SPIFLASH_defconfig +++ b/configs/T2080RDB_SPIFLASH_defconfig @@ -61,6 +61,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index 1e53273bd7..1c1fea60b5 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -44,6 +44,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig index 33591c2a65..ae924b1817 100644 --- a/configs/T2080RDB_revD_NAND_defconfig +++ b/configs/T2080RDB_revD_NAND_defconfig @@ -61,6 +61,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_revD_SDCARD_defconfig b/configs/T2080RDB_revD_SDCARD_defconfig index 82f6c96acb..fef08931d0 100644 --- a/configs/T2080RDB_revD_SDCARD_defconfig +++ b/configs/T2080RDB_revD_SDCARD_defconfig @@ -60,6 +60,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig index 075691fefe..0b7e71567d 100644 --- a/configs/T2080RDB_revD_SPIFLASH_defconfig +++ b/configs/T2080RDB_revD_SPIFLASH_defconfig @@ -62,6 +62,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T2080RDB_revD_defconfig b/configs/T2080RDB_revD_defconfig index 1d5628f559..c78b21dd24 100644 --- a/configs/T2080RDB_revD_defconfig +++ b/configs/T2080RDB_revD_defconfig @@ -45,6 +45,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig index ef2d1d749d..ea6a528495 100644 --- a/configs/T4240RDB_SDCARD_defconfig +++ b/configs/T4240RDB_SDCARD_defconfig @@ -51,6 +51,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index 6784dd7c20..e17e8b129f 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -36,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig index 7f19d991c5..10106ab023 100644 --- a/configs/am57xx_hs_evm_usb_defconfig +++ b/configs/am57xx_hs_evm_usb_defconfig @@ -102,6 +102,7 @@ CONFIG_DM_PMIC=y CONFIG_PMIC_PALMAS=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PALMAS=y +CONFIG_SCSI_AHCI_PLAT=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index b6eb955086..fa41c5e7a7 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -77,6 +77,8 @@ CONFIG_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_MVEBU=y CONFIG_SCSI=y +CONFIG_SCSI_AHCI_PLAT=y +CONFIG_SYS_SCSI_MAX_SCSI_ID=2 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_KIRKWOOD_SPI=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index dc8165a0ea..18dceb94d6 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -48,6 +48,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_KIRKWOOD_GPIO=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index 70d1917634..6d817d2b88 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index a46e2b4a87..2c3e3924bd 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -42,6 +42,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_SYS_ATA_STRIDE=4 CONFIG_SYS_ATA_DATA_OFFSET=0x100 CONFIG_SYS_ATA_REG_OFFSET=0x100 diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index ec1a7634df..663b2a4b75 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -46,6 +46,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index 3e8bfcf73a..61a25c234d 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -29,3 +29,5 @@ CONFIG_BOOTCOUNT_LIMIT=y # CONFIG_MMC is not set CONFIG_CALXEDA_XGMAC=y CONFIG_SCSI=y +CONFIG_SCSI_AHCI_PLAT=y +CONFIG_SYS_SCSI_MAX_SCSI_ID=5 diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index 9d8ea84cd1..bc4bd3a2f9 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -48,6 +48,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_KIRKWOOD_GPIO=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig index 5c8cee3ea9..42210602f9 100644 --- a/configs/ls1021atsn_qspi_defconfig +++ b/configs/ls1021atsn_qspi_defconfig @@ -62,6 +62,7 @@ CONFIG_TSEC_ENET=y CONFIG_NVME=y CONFIG_PCI=y CONFIG_PCIE_LAYERSCAPE_RC=y +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/ls1021atsn_sdcard_defconfig b/configs/ls1021atsn_sdcard_defconfig index a3b8f248c7..627038cb6e 100644 --- a/configs/ls1021atsn_sdcard_defconfig +++ b/configs/ls1021atsn_sdcard_defconfig @@ -78,6 +78,7 @@ CONFIG_TSEC_ENET=y CONFIG_NVME=y CONFIG_PCI=y CONFIG_PCIE_LAYERSCAPE_RC=y +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 756e072f9c..a8288e9fb6 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -87,6 +87,7 @@ CONFIG_PCI=y CONFIG_PCIE_LAYERSCAPE_RC=y CONFIG_U_QE=y CONFIG_SYS_QE_FW_ADDR=0x940000 +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index 310dfb4f5b..a8d02313b9 100644 --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@ -88,6 +88,7 @@ CONFIG_PCIE_LAYERSCAPE_EP=y CONFIG_POWER_LEGACY=y CONFIG_POWER_I2C=y CONFIG_SYS_QE_FMAN_FW_IN_MMC=y +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig index 266fce3327..96a96f58ee 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig @@ -91,6 +91,7 @@ CONFIG_MII=y CONFIG_FSL_LS_MDIO=y CONFIG_PCI=y CONFIG_PCIE_LAYERSCAPE_RC=y +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 62a1686612..c006e781c6 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -40,6 +40,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_KIRKWOOD_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 6fa01c6d06..c2e4770dd5 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -40,6 +40,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_KIRKWOOD_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index d8b5f33873..45898848e4 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -49,6 +49,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_KIRKWOOD_GPIO=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index 55753736c6..9f9a9822c9 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -49,6 +49,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_KIRKWOOD_GPIO=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index 89eb20d9c8..3a5eaca0d7 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -49,6 +49,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_KIRKWOOD_GPIO=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index 6e09985021..167c83604f 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -47,6 +47,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_BLK=y CONFIG_KIRKWOOD_GPIO=y CONFIG_SYS_I2C_LEGACY=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 6b08865b21..b6bf9d731b 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -49,6 +49,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_KIRKWOOD_GPIO=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 1de3433e38..a6f7960969 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -44,6 +44,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index c43418a022..52f3784c7c 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -47,6 +47,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_OMAP_HS=y CONFIG_DM_ETH=y CONFIG_SCSI=y +CONFIG_SCSI_AHCI_PLAT=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig index 8238ca8832..8fae434b34 100644 --- a/configs/pg_wcom_expu1_defconfig +++ b/configs/pg_wcom_expu1_defconfig @@ -79,6 +79,7 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_TSEC_ENET=y CONFIG_SYS_QE_FW_ADDR=0x60020000 +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig index 0fd5ebc9a7..8c8173ae9a 100644 --- a/configs/pg_wcom_expu1_update_defconfig +++ b/configs/pg_wcom_expu1_update_defconfig @@ -77,6 +77,7 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_TSEC_ENET=y CONFIG_SYS_QE_FW_ADDR=0x60020000 +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig index 229535c528..f9bd076a2d 100644 --- a/configs/pg_wcom_seli8_defconfig +++ b/configs/pg_wcom_seli8_defconfig @@ -79,6 +79,7 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_TSEC_ENET=y CONFIG_SYS_QE_FW_ADDR=0x60020000 +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig index fb5b715b08..84b076555f 100644 --- a/configs/pg_wcom_seli8_update_defconfig +++ b/configs/pg_wcom_seli8_update_defconfig @@ -77,6 +77,7 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_TSEC_ENET=y CONFIG_SYS_QE_FW_ADDR=0x60020000 +CONFIG_SCSI_AHCI_PLAT=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index dc211e3d50..0159cca126 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -58,6 +58,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_KIRKWOOD_GPIO=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MVEBU_MMC=y diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index e1aac61507..d82c180420 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -104,6 +104,7 @@ CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y CONFIG_ADC=y CONFIG_ADC_SANDBOX=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_SYS_IDE_MAXBUS=1 diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index faa991d453..3ca1f56435 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -128,6 +128,7 @@ CONFIG_DEBUG_DEVRES=y CONFIG_SIMPLE_PM_BUS=y CONFIG_ADC=y CONFIG_ADC_SANDBOX=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_SYS_IDE_MAXBUS=1 @@ -256,6 +257,9 @@ CONFIG_RESET_SCMI=y CONFIG_DM_RNG=y CONFIG_DM_RTC=y CONFIG_RTC_RV8803=y +CONFIG_SCSI_AHCI_PLAT=y +CONFIG_SYS_SCSI_MAX_SCSI_ID=8 +CONFIG_SYS_SCSI_MAX_LUN=4 CONFIG_SANDBOX_SERIAL=y CONFIG_SMEM=y CONFIG_SANDBOX_SMEM=y @@ -265,6 +269,7 @@ CONFIG_SOUND_MAX98357A=y CONFIG_SOUND_SANDBOX=y CONFIG_SOC_DEVICE=y CONFIG_SANDBOX_SPI=y +CONFIG_SCSI=y CONFIG_SPMI=y CONFIG_SPMI_SANDBOX=y CONFIG_SYSINFO=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 7bd5d01ace..d809712308 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -84,6 +84,7 @@ CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y CONFIG_ADC=y CONFIG_ADC_SANDBOX=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_CLK=y diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig index 3d47ea620b..b288ac2685 100644 --- a/configs/sandbox_noinst_defconfig +++ b/configs/sandbox_noinst_defconfig @@ -108,6 +108,7 @@ CONFIG_DEBUG_DEVRES=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_ADC=y CONFIG_ADC_SANDBOX=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_SYS_IDE_MAXBUS=1 diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 926c34c37e..cd1ad386ac 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -110,6 +110,7 @@ CONFIG_DEBUG_DEVRES=y # CONFIG_SPL_SIMPLE_BUS is not set CONFIG_ADC=y CONFIG_ADC_SANDBOX=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_SYS_IDE_MAXBUS=1 diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 599e6d661b..a3f2ceb833 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -47,6 +47,7 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_MVEBU_MMC=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index 061b7406f4..5da67c1971 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -55,6 +55,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_SATA=y CONFIG_SATA_MV=y +CONFIG_SYS_SATA_MAX_DEVICE=1 CONFIG_BOOTCOUNT_LIMIT=y CONFIG_BOOTCOUNT_RAM=y CONFIG_FPGA_ALTERA=y diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 1f8e90a69f..054e008b2a 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -19,6 +19,7 @@ CONFIG_OF_CONTROL=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set # CONFIG_ACPIGEN is not set +CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_SANDBOX_GPIO=y diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 1adf4dc8e2..ce6907e690 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -135,6 +135,16 @@ config SATA_SIL Enable this driver to support the SIL3131, SIL3132 and SIL3124 SATA controllers. +config SYS_SATA_MAX_DEVICE + int "Maximum number of SATA devices" + depends on !AHCI || FSL_SATA || SATA_MV + help + Sets the maximum number of SATA devices which can be supported + by U-Boot. + + This is only partially converted to driver model. See sata_bread() + for example, which shows where the conversion needs to be completed. + endif # SATA endmenu diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 3c826c95b7..c400e2de16 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -16,3 +16,33 @@ config DM_SCSI which supports SCSI and SATA HDDs. For every device configuration (IDs/LUNs) a block device is created with RAW read/write and filesystem support. + +if SCSI && !DM_SCSI + +config SCSI_AHCI_PLAT + bool "Platform-specific init of AHCI" + help + This enables a way for boards to set up an AHCI device manually, by + called ahci_init() and providing an ahci_reset() mechanism. + + This is deprecated. An AHCI driver should be provided instead. + +config SYS_SCSI_MAX_SCSI_ID + int "Maximum supporedt SCSI ID" + default 1 + help + Sets the maximum number of SCSI IDs to scan when looking for devices. + IDs from 0 to (this value - 1) are scanned. + + This is deprecated and is not needed when BLK is enabled. + +config SYS_SCSI_MAX_LUN + int "Maximum support SCSI LUN" + default 1 + help + Sets the maximum number of SCSI Logical Unit Numbers (LUNs) to scan on + devices. LUNs from 0 to (this value - 1) are scanned. + + This is deprecated and is not needed when CONFIG_DM_SCSI is enabled. + +endif diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index e9f848636c..25194eeec1 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -15,4 +15,6 @@ obj-$(CONFIG_SCSI) += scsi.o endif endif +ifdef CONFIG_SCSI obj-$(CONFIG_SANDBOX) += sandbox_scsi.o +endif diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 977d96a5a7..538d9c2197 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -275,7 +275,6 @@ /* * SATA */ -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1_OFFSET 0x18000 #define CONFIG_SYS_SATA1 (CONFIG_SYS_IMMR + CONFIG_SYS_SATA1_OFFSET) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 23b9969f84..106d1e6a4b 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -544,7 +544,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index ceaed464fe..e6d5321070 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -349,7 +349,6 @@ #define CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h index ed88b41844..8a0c7039f6 100644 --- a/include/configs/P4080DS.h +++ b/include/configs/P4080DS.h @@ -11,7 +11,6 @@ #define CONFIG_PCIE3 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 #define CONFIG_SYS_SRIO diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index f60010f787..9433f14227 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -438,7 +438,6 @@ /* SATA */ #define CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index f0bdcbae63..a41f9f0d9b 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -488,7 +488,6 @@ * SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 86dc5bfe82..7165ba0828 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -443,7 +443,6 @@ * SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 6923774a16..daccd816c1 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -180,7 +180,6 @@ /* SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA @@ -466,7 +465,6 @@ /* SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index e4e3872d1c..ff0498acde 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -48,11 +48,6 @@ #define CONFIG_NET_RETRY_COUNT 10 #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ -/* SATA */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - /* * Default to using SPI for environment, etc. * 0x000000 - 0x040000 : QSPI.SPL (256KiB) diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index d5eacf1ec7..871e87c26d 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -35,13 +35,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -/* SATA support */ -#ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#endif - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define RELOCATION_LIMITS_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 40bc821548..c19aaaccb1 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -160,7 +160,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ /* SATA */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 2c27a003b3..7fb96e8ad5 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -18,13 +18,6 @@ * U-Boot into it. */ -/* - * SATA/SCSI/AHCI configuration - */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - /* Environment in SPI NOR flash */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 6d272c6d88..bd264122da 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -347,7 +347,6 @@ /* SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index f5ea3657a4..8dc73e8b1c 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -13,13 +13,6 @@ /* I2C */ #define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE -/* - * SATA/SCSI/AHCI configuration - */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - /* Environment in SPI NOR flash */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 449a56753b..7baae3b090 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -28,7 +28,6 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* SATA support */ -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 /* PCIe support */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index aec30c461d..711e37cb9b 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -74,9 +74,6 @@ /* SPI SPL */ -/* SATA */ -#define CONFIG_SCSI_AHCI_PLAT - /* NAND support */ #ifdef CONFIG_MTD_RAW_NAND /* NAND: device related configs */ diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index beea234d8d..0b3ee131ae 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -45,7 +45,6 @@ * SATA Driver configuration */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #endif /* CONFIG_SATA */ diff --git a/include/configs/durian.h b/include/configs/durian.h index ce9e57c64b..f0789d5fb3 100644 --- a/include/configs/durian.h +++ b/include/configs/durian.h @@ -18,12 +18,6 @@ /* PCI CONFIG */ #define CONFIG_PCI_SCAN_SHOW -/* SCSI */ -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SATA_MAX_DEVICE 4 - /* BOOT */ #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index bde14a7b3d..402c5bfacb 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -21,7 +21,6 @@ /* SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index c279579268..51e671a951 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -48,7 +48,6 @@ #endif /* SATA driver configuration */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 8f73c3b873..668d00cbc0 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -41,7 +41,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA - #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/helios4.h b/include/configs/helios4.h index c1d42f17ca..151ab66f4c 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -35,13 +35,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -/* SATA support */ -#ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#endif - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define RELOCATION_LIMITS_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 6d559746ab..55c874bf61 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -16,10 +16,6 @@ #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 5 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 7366a332f9..0a988e2fad 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -30,9 +30,6 @@ #define CONFIG_LBA48 #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \ defined(CONFIG_NET2BIG_V2) -#define CONFIG_SYS_SATA_MAX_DEVICE 2 -#else -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #endif #endif /* CONFIG_SATA */ diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index 10274317cf..0263bb8289 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -14,13 +14,9 @@ #define CONFIG_SYS_SDRAM_SIZE 0x40000000 /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA AHCI_BASE_ADDR -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index e33bafac61..f92ff17eeb 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -31,13 +31,9 @@ #define CONFIG_SYS_FSL_QSPI_BASE 0x40000000 /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA AHCI_BASE_ADDR -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - /* I2C */ /* GPIO */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index c02be10c6f..2e5b804a4c 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -81,16 +81,12 @@ */ /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #ifndef PCI_DEVICE_ID_FREESCALE_AHCI #define PCI_DEVICE_ID_FREESCALE_AHCI 0x0440 #endif #define CONFIG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ PCI_DEVICE_ID_FREESCALE_AHCI} -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - /* SPI */ /* diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index 2c50490b9c..1b4d181310 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -72,11 +72,8 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 #ifndef SPL_NO_ENV #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 653d2ac678..0770f4e268 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -57,12 +57,9 @@ #endif /* SATA */ -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 /* Initial environment variables */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 083e2e6560..ea6831bb82 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -46,7 +46,6 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT /* EEPROM */ #define CONFIG_SYS_I2C_EEPROM_NXID @@ -54,9 +53,6 @@ #define CONFIG_SYS_SATA AHCI_BASE_ADDR -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - /* * IFC Definitions */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 507d770f17..31b578ae33 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -234,8 +234,6 @@ /* SATA */ #ifndef SPL_NO_SATA -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 2 #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 15d4364a09..7552610e03 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -122,12 +122,7 @@ /* SATA */ #ifndef SPL_NO_SATA -#define CONFIG_SCSI_AHCI_PLAT - #define CONFIG_SYS_SATA AHCI_BASE_ADDR - -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 #endif /* FMan ucode */ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index e9a9c64217..33b70c8d8f 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -128,11 +128,7 @@ unsigned long long get_qixis_addr(void); /* SATA */ #ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 - -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 #endif /* Physical Memory Map */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 8b4ea499e8..7554de1f6d 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -33,14 +33,10 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) #define CONFIG_SYS_NOR_AMASK_EARLY IFC_AMASK(64*1024*1024) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 1253698c88..1c05b08677 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -43,14 +43,10 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT) #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index e8e02e7f7b..7fa4f00734 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -96,7 +96,6 @@ #endif /* CONFIG_CMD_NET */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SYS_64BIT_LBA #define CONFIG_LBA48 #endif diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index eb88a572e7..e31f8d087f 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -109,11 +109,8 @@ /* SATA */ #ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 #endif /* USB */ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 4a1d959d17..8486cf8fc6 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -99,7 +99,6 @@ * SATA */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index c192512e85..fd9ce344db 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -51,13 +51,9 @@ /* * SATA/SCSI/AHCI configuration */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_LBA48 #define CONFIG_SYS_64BIT_LBA -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 6a113ec214..44bba6555c 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -46,13 +46,9 @@ /* * SATA/SCSI/AHCI configuration */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_LBA48 #define CONFIG_SYS_64BIT_LBA -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - /* * PCI configuration */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 92140df4be..01ed221873 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -125,7 +125,6 @@ #define CONFIG_BOARD_SIZE_LIMIT 785408 #ifdef CONFIG_CMD_SATA - #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 7d3e651f44..1c25857296 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -18,7 +18,6 @@ /* SATA Configuration */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 1a1c08bd30..678b433cd7 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -23,7 +23,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 8cc9ca6a49..ccf4519119 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -32,7 +32,6 @@ /* SATA driver configuration */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #endif /* CONFIG_SATA */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index e9a9d50db1..75e84c35ee 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -49,8 +49,4 @@ #define CONSOLEDEV "ttyS2" -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 - #endif /* __CONFIG_OMAP5_EVM_H */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b993ec8316..92008cd38e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -138,7 +138,6 @@ #define CONFIG_PCIE1 /* PCIE controller 1 (slot 1) */ #define CONFIG_PCIE2 /* PCIE controller 2 (slot 2) */ -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 #define CONFIG_HWCONFIG diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index 568a93623d..f8555f6e48 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -43,11 +43,6 @@ #endif /* - * SATA Driver configuration - */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 - -/* * Support large disk for SATA and USB */ #define CONFIG_SYS_64BIT_LBA diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index a352d6e068..75efbf3448 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -29,10 +29,4 @@ #define CONFIG_SANDBOX_SDL #endif -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 8 -#define CONFIG_SYS_SCSI_MAX_LUN 4 - -#define CONFIG_SYS_SATA_MAX_DEVICE 2 - #endif diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 8dba4fcb4f..4499a63aed 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -46,7 +46,6 @@ * SATA driver configuration */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 #endif /* CONFIG_SATA */ diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 30adfe948f..087764666b 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -32,8 +32,6 @@ #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4 - /* Environment options */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 58ccafc385..065b406e2e 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -40,7 +40,6 @@ /* SATA */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 3c942cc6fa..14817b165c 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -41,7 +41,6 @@ "initrd_high=0x10000000\0" /* SATA support */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 /* Enable LCD and reserve 512KB from top of memory*/ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 051c18ca23..80e8fe1deb 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -17,7 +17,6 @@ /* SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7d8829e9c0..6b21e3918d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -722,7 +722,6 @@ CONFIG_SAR_REG CONFIG_SATA1 CONFIG_SATA2 CONFIG_SCIF_A -CONFIG_SCSI_AHCI_PLAT CONFIG_SCSI_DEV_LIST CONFIG_SC_TIMER_CLK CONFIG_SDCARD @@ -1846,7 +1845,6 @@ CONFIG_SYS_SATA2 CONFIG_SYS_SATA2_FLAGS CONFIG_SYS_SATA2_OFFSET CONFIG_SYS_SATA_FAT_BOOT_PARTITION -CONFIG_SYS_SATA_MAX_DEVICE CONFIG_SYS_SBFHDR_DATA_OFFSET CONFIG_SYS_SBFHDR_SIZE CONFIG_SYS_SCCR_SATACM @@ -1854,8 +1852,6 @@ CONFIG_SYS_SCCR_TSEC1CM CONFIG_SYS_SCCR_TSEC2CM CONFIG_SYS_SCCR_USBDRCM CONFIG_SYS_SCR -CONFIG_SYS_SCSI_MAX_LUN -CONFIG_SYS_SCSI_MAX_SCSI_ID CONFIG_SYS_SDRAM CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_BASE0 |