tegra: don't hard-code LCD into default TEGRA_DEVICE_SETTINGS
authorStephen Warren <swarren@nvidia.com>
Tue, 22 Jan 2013 06:20:07 +0000 (06:20 +0000)
committerTom Warren <twarren@nvidia.com>
Mon, 11 Feb 2013 17:35:24 +0000 (10:35 -0700)
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>
include/configs/tegra-common-post.h

index 74bebb726e1a8901117026f8a69ff1a52b90ee56..f2a70b1a35c87fcaed23f2eace5ded446d8a3f43 100644 (file)
 #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 \