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 /common/board_r.c | |
| parent | 1e4d9dd871512e1955e45ac1c3095fb063c0d07c (diff) | |
| download | u-boot-b630f8b3aefc2d11cdc73314743a6fb16deaf4c5.zip u-boot-b630f8b3aefc2d11cdc73314743a6fb16deaf4c5.tar.gz u-boot-b630f8b3aefc2d11cdc73314743a6fb16deaf4c5.tar.bz2 | |
scsi: Forceably finish migration to DM_SCSIWIP/07Nov2023-next
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 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/common/board_r.c b/common/board_r.c index a796784..da0b80f 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -472,17 +472,6 @@ static int initr_status_led(void) } #endif -#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI) -static int initr_scsi(void) -{ - puts("SCSI: "); - scsi_init(); - puts("\n"); - - return 0; -} -#endif - #ifdef CONFIG_CMD_NET static int initr_net(void) { @@ -732,10 +721,6 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_BOARD_LATE_INIT board_late_init, #endif -#if defined(CONFIG_SCSI) && !defined(CONFIG_DM_SCSI) - INIT_FUNC_WATCHDOG_RESET - initr_scsi, -#endif #ifdef CONFIG_BITBANGMII bb_miiphy_init, #endif |