Patchwork [U-Boot,v4,09/10] tegra: Switch on console mux and use environment for console

login
register
mail settings
Submitter Simon Glass
Date April 17, 2012, 7:01 p.m.
Message ID <1334689297-13489-10-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/153285/
State Accepted, archived
Headers show

Comments

Simon Glass - April 17, 2012, 7:01 p.m.
All tegra boards will use these options by default.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 include/configs/tegra2-common.h |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Stephen Warren - April 23, 2012, 9:10 p.m.
On 04/17/2012 01:01 PM, Simon Glass wrote:
> All tegra boards will use these options by default.

Well, there are certainly Tegra boards without matrix keyboards, so I'm
not entirely sure that's actually true...

That said, I don't see a real problem with the generic mainline U-Boot
assuming this will be true (people using it in products can always
adjust their config as they see fit)

So,
Acked-by: Stephen Warren <swarren@wwwdotorg.org>

Patch

diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index c5870dd..068ce88 100644
--- a/include/configs/tegra2-common.h
+++ b/include/configs/tegra2-common.h
@@ -132,11 +132,18 @@ 
 
 #define CONFIG_SYS_NO_FLASH
 
-/* Environment information */
+/* Environment information, boards can override if required */
+#define CONFIG_CONSOLE_MUX
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define TEGRA2_DEVICE_SETTINGS	"stdin=serial\0" \
+					"stdout=serial\0" \
+					"stderr=serial\0"
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"console=ttyS0,115200n8\0" \
 	"mem=" TEGRA2_SYSMEM "\0" \
 	"smpflag=smp\0" \
+	TEGRA2_DEVICE_SETTINGS
 
 #define CONFIG_LOADADDR		0x408000	/* def. location for kernel */
 #define CONFIG_BOOTDELAY	2		/* -1 to disable auto boot */