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

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

diff --git a/include/configs/whistler.h b/include/configs/whistler.h
index ed3eda1f0f992c9144338e4951b1376f6fa02ac5..ff859644c36aa4c09f516458b648fcb3e22adcb3 100644 (file)
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -8,16 +8,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include "tegra20-common.h"
 
-/* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE     tegra20-whistler
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
-
 /* High-level configuration options */
-#define V_PROMPT               "Tegra20 (Whistler) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Whistler"
 
 /* Board-specific serial config */
@@ -27,14 +21,8 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_WHISTLER
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
-#define CONFIG_TEGRA_I2C
-#define CONFIG_SYS_I2C_INIT_BOARD
-#define CONFIG_I2C_MULTI_BUS
-#define CONFIG_SYS_MAX_I2C_BUS         4
-#define CONFIG_SYS_I2C_SPEED           100000
+#define CONFIG_SYS_I2C_TEGRA
 #define CONFIG_CMD_I2C
 
 /* SD/MMC */
@@ -65,7 +53,6 @@
 #define CONFIG_USB_ETHER_ASIX
 
 /* General networking support */
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_DHCP
 
 #include "tegra-common-post.h"