diff options
| author | Sven Schwermer <sven@svenschwermer.de> | 2018-11-21 08:43:56 +0100 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-11-26 21:19:03 +0100 |
| commit | fd09c205fc57b90a782cac33449ef172575d0a8c (patch) | |
| tree | b23d462a78db88ec589c50d769fa6522b3f16c63 /common/usb_storage.c | |
| parent | ab5817027f9b4fce25f5f2a3e20577ac55bbd7e0 (diff) | |
| download | u-boot-fd09c205fc57b90a782cac33449ef172575d0a8c.tar.gz | |
usb: s/CONFIG_DM_USB/CONFIG_IS_ENABLED(DM_USB)/
This allows to disable the USB driver model in SPL because it checks
the CONFIG_SPL_DM_USB variable for SPL builds. Nothing changes for
regular non-SPL builds.
Signed-off-by: Sven Schwermer <sven@svenschwermer.de>
Diffstat (limited to 'common/usb_storage.c')
| -rw-r--r-- | common/usb_storage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c index 560d60538b..c9a99b1ca2 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -299,7 +299,7 @@ int usb_stor_scan(int mode) if (mode == 1) printf(" scanning usb for storage devices... "); -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) unsigned char i; usb_disable_asynch(1); /* asynch transfer not allowed */ @@ -942,7 +942,7 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev, size_t __maybe_unused size; int __maybe_unused ret; -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) #ifdef CONFIG_USB_EHCI_HCD /* * The U-Boot EHCI driver can handle any transfer length as long as @@ -1495,7 +1495,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss, return 1; } -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int usb_mass_storage_probe(struct udevice *dev) { |