summaryrefslogtreecommitdiff
path: root/common/cmd_usb.c
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-08-05 16:58:17 +0200
committerSimon Glass <sjg@chromium.org>2015-08-05 20:57:50 -0600
commit389f1856bd0882471214c2ac94da2b415362c10f (patch)
treecd35eca53fc92f216956bb41c642784cefa1425f /common/cmd_usb.c
parenta5325cd5e91f77a2214e80198ae31c1d8b7e7c3c (diff)
downloadu-boot-imx-389f1856bd0882471214c2ac94da2b415362c10f.zip
u-boot-imx-389f1856bd0882471214c2ac94da2b415362c10f.tar.gz
u-boot-imx-389f1856bd0882471214c2ac94da2b415362c10f.tar.bz2
dm: usb: fix USB Ethernet without CONFIG_DM_ETH regression
The following commit enforces CONFIG_DM_ETH for USB Ethernet which breaks any board using CONFIG_USB_HOST_ETHER without CONFIG_DM_ETH which this patch fixes. commit 69559093f6173dcfcb041df0995063bdbd07d49b dm: usb: Avoid using USB ethernet with CONFIG_DM_USB and no DM_ETH Tested on Colibri T20/T30 as well as Apalis T30 with CONFIG_USB_HOST_ETHER and CONFIG_USB_ETHER_ASIX enabled and a LevelOne USB-0301 ASIX AX88772 dongle. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_usb.c')
-rw-r--r--common/cmd_usb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 0ade775..6874af7 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -530,13 +530,16 @@ static void do_usb_start(void)
/* try to recognize storage devices immediately */
usb_stor_curr_dev = usb_stor_scan(1);
#endif
+#endif
#ifdef CONFIG_USB_HOST_ETHER
# ifdef CONFIG_DM_ETH
-# error "You must use CONFIG_DM_USB if you want to use CONFIG_USB_HOST_ETHER with CONFIG_DM_ETH"
-# endif
+# ifndef CONFIG_DM_USB
+# error "You must use CONFIG_DM_USB if you want to use CONFIG_USB_HOST_ETHER with CONFIG_DM_ETH"
+# endif
+# else
/* try to recognize ethernet devices immediately */
usb_ether_curr_dev = usb_host_eth_scan(1);
-#endif
+# endif
#endif
#ifdef CONFIG_USB_KEYBOARD
drv_usb_kbd_init();