Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index e407ff4..040bfe4 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -37,7 +37,6 @@
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Harmony"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTD
 
 /* UARTD: keyboard satellite board UART, default */
@@ -73,8 +72,11 @@
 #define CONFIG_ENV_OFFSET      (SZ_512M - SZ_128K) /* 128K sector size */
 
 /* USB Host support */
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
+#define CONFIG_USB_ULPI
+#define CONFIG_USB_ULPI_VIEWPORT
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB