Current implementation of splash_init_usb() requires usb_stor_scan()
which doesn't exist in case of DM_USB simply because real probing
happens right in usb_init().
So disable usage of usb_stor_scan() in case of DM_USB.
Signed-off-by: Alexey Brodkin <abrod...@synopsys.com>
Cc: Nikita Kiryanov <nik...@compulab.co.il>
Cc: Simon Glass <s...@chromium.org>
Cc: Jeroen Hofstee <jer...@myspectrum.nl>
Cc: Anatolij Gustschin <ag...@denx.de>
Cc: Robert Winkler <robert.wink...@boundarydevices.com>
---
common/splash_source.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/common/splash_source.c b/common/splash_source.c
index 914f12f..230b2db 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -146,7 +146,11 @@ static int splash_init_usb(void)
if (err)
return err;
- return usb_stor_scan(1) < 0 ? -ENODEV : 0;
+#ifndef CONFIG_DM_USB
+ err = usb_stor_scan(1) < 0 ? -ENODEV : 0;
+#endif
+
+ return err;
}
#else
static inline int splash_init_usb(void)
--
2.5.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
