diff options
| author | Simon Glass <sjg@chromium.org> | 2017-07-04 13:31:19 -0600 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2017-08-01 11:58:00 +0900 |
| commit | c4d660d4d0abcde0fdbcee8401b215fc2b56d7aa (patch) | |
| tree | 4cde2f77de3c28d2462e3ec42ba9e2d85bc42d30 /drivers/scsi | |
| parent | 745a94f352b8f6f05e038110d3ce44d211bf31f3 (diff) | |
dm: mmc: Allow disabling driver model in SPL
At present if U-Boot proper uses driver model for MMC, then SPL has to
also. While this is desirable, it places a significant barrier to moving
to driver model in some cases. For example, with a space-constrained SPL
it may be necessary to enable CONFIG_SPL_OF_PLATDATA which involves
adjusting some drivers.
Add new SPL versions of the options for DM_MMC, DM_MMC_OPS and BLK. By
default these follow their non-SPL versions, but this can be changed by
boards which need it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 7ec7ecc295..f192ca597c 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -451,7 +451,7 @@ static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc) dev_desc->product[0] = 0; dev_desc->revision[0] = 0; dev_desc->removable = false; -#ifndef CONFIG_BLK +#if !CONFIG_IS_ENABLED(BLK) dev_desc->block_read = scsi_read; dev_desc->block_write = scsi_write; #endif |