Merge branch 'u-boot/master' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / include / configs / ventana.h

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 3b9d142..3f1ebcd 100644 (file)
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -11,9 +11,6 @@
 #include <linux/sizes.h>
 #include "tegra20-common.h"
 
-/* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */
-#define CONFIG_DEFAULT_DEVICE_TREE     tegra20-ventana
-
 /* High-level configuration options */
 #define V_PROMPT               "Tegra20 (Ventana) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Ventana"
@@ -24,9 +21,6 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_VENTANA
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT         /* Make sure LCD init is complete */
-
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
@@ -50,7 +44,6 @@
 #define CONFIG_USB_ETHER_ASIX
 
 /* General networking support */
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_DHCP
 
 /* USB keyboard */