| Message ID | 1467402456-14808-1-git-send-email-abrodkin@synopsys.com |
|---|---|
| State | Accepted |
| Commit | d7b60fbfa63431eedccac17674311f0055f323fe |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
On 1 July 2016 at 12:47, Alexey Brodkin <Alexey.Brodkin@synopsys.com> wrote: > 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 <abrodkin@synopsys.com> > Cc: Nikita Kiryanov <nikita@compulab.co.il> > Cc: Simon Glass <sjg@chromium.org> > Cc: Jeroen Hofstee <jeroen@myspectrum.nl> > Cc: Anatolij Gustschin <agust@denx.de> > Cc: Robert Winkler <robert.winkler@boundarydevices.com> > --- > common/splash_source.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Alexey, On Fri, 1 Jul 2016 22:47:36 +0300 Alexey Brodkin Alexey.Brodkin@synopsys.com wrote: > 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 <abrodkin@synopsys.com> > Cc: Nikita Kiryanov <nikita@compulab.co.il> > Cc: Simon Glass <sjg@chromium.org> > Cc: Jeroen Hofstee <jeroen@myspectrum.nl> > Cc: Anatolij Gustschin <agust@denx.de> > Cc: Robert Winkler <robert.winkler@boundarydevices.com> > --- > common/splash_source.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) applied to u-boot-video/master, thanks! Anatolij
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)
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 <abrodkin@synopsys.com> Cc: Nikita Kiryanov <nikita@compulab.co.il> Cc: Simon Glass <sjg@chromium.org> Cc: Jeroen Hofstee <jeroen@myspectrum.nl> Cc: Anatolij Gustschin <agust@denx.de> Cc: Robert Winkler <robert.winkler@boundarydevices.com> --- common/splash_source.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)