[U-Boot] [PATCH v2] dm: usb: fix USB Ethernet without CONFIG_DM_ETH regression

[Simon Glass]

Hi Marcel,

On 5 August 2015 at 08:58, Marcel Ziswiler <marcel at ziswiler.com> wrote:
> From: Marcel Ziswiler <marcel.ziswiler at toradex.com>
>
> 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 at toradex.com>
> ---
> Changes in v2: Fix commit message as pointed out by Simon.
>
>  common/cmd_usb.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)

Acked-by: Simon Glass <sjg at chromium.org>

What do you think about changing Tegra over to CONFIG_DM_ETH? Do you
have any leads on the problem you found?

>
> 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();
> --
> 2.4.3
>

Regards,
Simon