summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-06-16 16:23:32 -0700
committerSimon Glass <sjg@chromium.org>2011-08-29 10:39:30 -0700
commit14abc271e655fa3e9d6ea9e9d196a458547e9975 (patch)
tree9358774e5f479b6e8a666f4ad8c4a994bfb3f9fd /include/configs
parent4fe837d6b41c08f3ad47f604acb06c41ac8cc14f (diff)
Fix Harmony build
The Harmony build was broken due to lack of device tree and MMC support. This change fixes that. BUG=chromium-os:11623 TEST=build for Harmony Change-Id: I0135e13895f5bc873a8e8e18e14672ce3d7e7a6e Reviewed-on: http://gerrit.chromium.org/gerrit/2809 Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/harmony.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 0f9cf644522..b7cb5998128 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -34,6 +34,9 @@
/* Board-specific serial config */
#define CONFIG_SERIAL_MULTI
+
+#ifndef CONFIG_OF_CONTROL
+
#define CONFIG_TEGRA2_ENABLE_UARTD
/* UARTD: keyboard satellite board UART, default */
@@ -43,6 +46,17 @@
#define CONFIG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE
#endif
+/* To select the order in which U-Boot sees USB ports */
+#define CONFIG_TEGRA2_USB0 NV_PA_USB3_BASE
+#define CONFIG_TEGRA2_USB1 NV_PA_USB1_BASE
+#define CONFIG_TEGRA2_USB2 0
+#define CONFIG_TEGRA2_USB3 0
+
+/* Put USB1 in host mode */
+#define CONFIG_TEGRA2_USB1_HOST
+#endif /* CONFIG_OF_CONTROL */
+
+
#define CONFIG_MACH_TYPE MACH_TYPE_HARMONY
#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */
@@ -51,4 +65,6 @@
#define CONFIG_TEGRA2_GPIO
#define CONFIG_CMD_TEGRA2_GPIO_INFO
+
+#define CONFIG_DEFAULT_DEVICE_TREE "tegra2-harmony"
#endif /* __CONFIG_H */