diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-27 20:59:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-07 18:36:06 -0500 |
| commit | b630f8b3aefc2d11cdc73314743a6fb16deaf4c5 (patch) | |
| tree | aec72ad96d6bf3df382438a6224ec2ee9e886e26 /board | |
| parent | 1e4d9dd871512e1955e45ac1c3095fb063c0d07c (diff) | |
| download | u-boot-b630f8b3aefc2d11cdc73314743a6fb16deaf4c5.tar.gz u-boot-b630f8b3aefc2d11cdc73314743a6fb16deaf4c5.tar.bz2 u-boot-b630f8b3aefc2d11cdc73314743a6fb16deaf4c5.zip | |
scsi: Forceably finish migration to DM_SCSI
The migration deadline for moving to DM_SCSI was v2023.04. A further
reminder was sent out in August 2023 to the remaining platforms that had
not migrated already, and that a few more over the line (or configs
deleted).
With this commit we:
- Rename CONFIG_DM_SCSI to CONFIG_SCSI.
- Remove all of the non-DM SCSI code. This includes removing other
legacy symbols and code and removes some legacy non-DM AHCI code.
- Some platforms that had previously been DM_SCSI=y && SCSI=n are now
fully migrated to DM_SCSI as a few corner cases in the code assumed
DM_SCSI=y meant SCSI=y.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/emulation/qemu-riscv/Kconfig | 1 | ||||
| -rw-r--r-- | board/highbank/highbank.c | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig index d56b4b5bc1..108e9fdb00 100644 --- a/board/emulation/qemu-riscv/Kconfig +++ b/board/emulation/qemu-riscv/Kconfig @@ -59,7 +59,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply PCIE_ECAM_GENERIC imply DM_RNG imply SCSI - imply DM_SCSI imply SYS_NS16550 imply SIFIVE_SERIAL imply HTIF_CONSOLE if 64BIT diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c index b5fa5101e8..7f67d1e453 100644 --- a/board/highbank/highbank.c +++ b/board/highbank/highbank.c @@ -52,19 +52,6 @@ int board_init(void) return 0; } -#ifdef CONFIG_SCSI_AHCI_PLAT -void scsi_init(void) -{ - u32 reg = readl(HB_SREG_A9_PWRDOM_STAT); - - cphy_disable_overrides(); - if (reg & PWRDOM_STAT_SATA) { - ahci_init((void __iomem *)HB_AHCI_BASE); - scsi_scan(true); - } -} -#endif - #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { |