am335x_evm: do not define usb ether gadget when Eth DM is defined

[u-boot] / include / configs / kwb.h

diff --git a/include/configs/kwb.h b/include/configs/kwb.h
index 7798b8001deb966baf00a1287e033adc857f54f7..96f2e9d39b442b10dd9ed09bfca0ac5361b7bbf9 100644 (file)
--- a/include/configs/kwb.h
+++ b/include/configs/kwb.h
@@ -3,7 +3,7 @@
  *
  * specific parts for B&R KWB Motherboard
  *
- * Copyright (C) 2013 Hannes Petermaier <oe5hpm@oevsv.at> -
+ * Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
  * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
  *
  * SPDX-License-Identifier:        GPL-2.0+
@@ -80,10 +80,6 @@ BUR_COMMON_ENV \
        "run loadromfs; " \
        "tftp ${loadaddr} arimg && go ${loadaddr}; " \
        "puts 'networkboot failed!';\0" \
-"usbupdate=echo updating u-boot from usb ...; " \
-       "usb start; " \
-       "fatload usb 0 0x80000000 updateubootusb.img && source; " \
-       "puts 'usbupdate failed!'\0" \
 "netscript=echo running script from network (tftp) ...; " \
        "tftp 0x80000000 netscript.img && source; " \
        "puts 'netscript load failed!'\0" \
@@ -101,7 +97,7 @@ BUR_COMMON_ENV \
 #endif /* !CONFIG_SPL_BUILD*/
 
 #define CONFIG_BOOTCOMMAND \
-       "run usbupdate;"
+       "run usbscript;"
 #define CONFIG_BOOTDELAY               0
 
 /* undefine command which we not need here */
@@ -120,20 +116,20 @@ BUR_COMMON_ENV \
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_MUSB_PIO_ONLY
-#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
+#define CONFIG_USB_MUSB_PIO_ONLY
+#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 /* attention! not only for gadget, enables also highspeed in hostmode */
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_MUSB_HOST
+#define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_HOST
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE        MUSB_HOST
 
-#ifdef CONFIG_MUSB_HOST
+#ifdef CONFIG_USB_MUSB_HOST
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
-#endif /* CONFIG_MUSB_HOST */
+#endif /* CONFIG_USB_MUSB_HOST */
 
 #undef CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_IS_IN_MMC