diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-09 09:29:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-09 09:29:07 -0500 |
| commit | 859703251251d9567f29ab10c0a29f98eb0aff5c (patch) | |
| tree | e0863f7cced9c153b8b083575d52faec05fae8d7 /drivers/scsi/scsi.c | |
| parent | 531c00894577a0a852431adf61ade76925f8b162 (diff) | |
| parent | cccc4ab86f5e64ea6fe1e79b3ca2453baa049120 (diff) | |
Merge branch '2022-02-08-Kconfig-updates'
- Assorted general code cleanups to make sure we use the right macros
and use them correctly and buildman updates around kconfig.h itself.
- Convert some IDE and SCSI symbols to Kconfig.
- Convert CONFIG_REMAKE_ELF
- Introduce conversion deadline for DM_SCSI.
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index d93d2419285..d7b33010e46 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -46,7 +46,7 @@ static int scsi_max_devs; /* number of highest available scsi device */ static int scsi_curr_dev; /* current device */ -static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE]; +static struct blk_desc scsi_dev_desc[SCSI_MAX_DEVICE]; #endif /* almost the maximum amount of the scsi_ext command.. */ @@ -655,7 +655,7 @@ int scsi_scan(bool verbose) if (verbose) printf("scanning bus for devices...\n"); - for (i = 0; i < CONFIG_SYS_SCSI_MAX_DEVICE; i++) + for (i = 0; i < SCSI_MAX_DEVICE; i++) scsi_init_dev_desc(&scsi_dev_desc[i], i); scsi_max_devs = 0; @@ -703,7 +703,7 @@ U_BOOT_DRIVER(scsi_blk) = { U_BOOT_LEGACY_BLK(scsi) = { .if_typename = "scsi", .if_type = IF_TYPE_SCSI, - .max_devs = CONFIG_SYS_SCSI_MAX_DEVICE, + .max_devs = SCSI_MAX_DEVICE, .desc = scsi_dev_desc, }; #endif |