summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-04-17 09:01:36 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-05-15 08:31:40 +0200
commit4120c271c3efa0c224fe02046ee7ae4b818d8044 (patch)
tree2d888b93474991168efc1c09f0df603044e05c9d
parent6642a681e410c1b3d767742d74146cb624dca287 (diff)
downloadu-boot-4120c271c3efa0c224fe02046ee7ae4b818d8044.tar.gz
tegra: Switch on console mux and use environment for console
All tegra boards will use these options by default. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--include/configs/tegra2-common.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/tegra2-common.h b/include/configs/tegra2-common.h
index c5870dd4be..068ce8855f 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 */