Patchwork [U-Boot,1/2] tegra: don't hard-code LCD into default TEGRA_DEVICE_SETTINGS

login
register
mail settings
Submitter Stephen Warren
Date Jan. 22, 2013, 4:20 p.m.
Message ID <1358871608-31858-1-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/214586/
State Accepted
Delegated to: Tom Warren
Headers show

Comments

Stephen Warren - Jan. 22, 2013, 4:20 p.m.
From: Stephen Warren <swarren@nvidia.com>

Only add "lcd" into TEGRA_DEVICE_SETTINGS if CONFIG_VIDEO_TEGRA.
Otherwise, "lcd" is meaningless.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 include/configs/tegra-common-post.h |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
Simon Glass - Jan. 22, 2013, 9:13 p.m.
On Tue, Jan 22, 2013 at 8:20 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> 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>

> ---
>  include/configs/tegra-common-post.h |   11 +++++++++--
>  1 file 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 \
> --
> 1.7.10.4
>

Patch

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 \