summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-01-22 06:20:07 +0000
committerTom Warren <twarren@nvidia.com>2013-02-11 10:35:24 -0700
commitc35eb56a0e6f986cccd502625ed9c4b1cee23ffa (patch)
tree0cca82a29033c9fbd96826eefbb1daea1112fc17
parent4727a13bde609c22e4152bf13400547acaad29fa (diff)
downloadu-boot-imx-c35eb56a0e6f986cccd502625ed9c4b1cee23ffa.zip
u-boot-imx-c35eb56a0e6f986cccd502625ed9c4b1cee23ffa.tar.gz
u-boot-imx-c35eb56a0e6f986cccd502625ed9c4b1cee23ffa.tar.bz2
tegra: don't hard-code LCD into default TEGRA_DEVICE_SETTINGS
Only add "lcd" into TEGRA_DEVICE_SETTINGS if CONFIG_VIDEO_TEGRA. Otherwise, "lcd" is meaningless. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--include/configs/tegra-common-post.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 74bebb7..f2a70b1 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -133,10 +133,17 @@
#define STDIN_KBD_USB ""
#endif
+#ifdef CONFIG_VIDEO_TEGRA
+#define STDOUT_LCD ",lcd"
+#else
+#define STDOUT_LCD ""
+#endif
+
#define TEGRA_DEVICE_SETTINGS \
"stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB "\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0" \
+ "stdout=serial" STDOUT_LCD "\0" \
+ "stderr=serial" STDOUT_LCD "\0" \
+ ""
#define CONFIG_EXTRA_ENV_SETTINGS \
TEGRA_DEVICE_SETTINGS \