summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-30 16:37:49 -0700
committerTom Warren <twarren@nvidia.com>2016-02-16 09:17:51 -0700
commit135a87ef43566cdd592fa9fd899bf435aa14aaa3 (patch)
tree0ef4aef10bab6055a7f13b9a8609c813a89081ec /include/configs
parent3f2997a40c78ad4dae48809a5c9fdfe9505787c5 (diff)
tegra: Allow CONFIG_DM_VIDEO to be used as well as CONFIG_LCD
While we transition to using driver model for video, we need to support both options. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/tegra-common-post.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 68da23e8b70..b6b8ffc08f4 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -53,6 +53,12 @@
#define STDOUT_LCD ""
#endif
+#ifdef CONFIG_DM_VIDEO
+#define STDOUT_VIDEO ",vidconsole"
+#else
+#define STDOUT_VIDEO ""
+#endif
+
#ifdef CONFIG_CROS_EC_KEYB
#define STDOUT_CROS_EC ",cros-ec-keyb"
#else
@@ -61,8 +67,8 @@
#define TEGRA_DEVICE_SETTINGS \
"stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \
- "stdout=serial" STDOUT_LCD "\0" \
- "stderr=serial" STDOUT_LCD "\0" \
+ "stdout=serial" STDOUT_LCD STDOUT_VIDEO "\0" \
+ "stderr=serial" STDOUT_LCD STDOUT_VIDEO "\0" \
""
#ifndef BOARD_EXTRA_ENV_SETTINGS