summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2013-11-26 17:45:25 +0000
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2013-11-26 21:49:17 +0100
commitd18d49d7ad77f1a97b9697b3761802de5b82983d (patch)
treecaf597d190cfbaa55281935184bdad4bff8a1f50
parentd19ad726bcd5d9106f7ba9c750462fcc369f1020 (diff)
downloadu-boot-imx-d18d49d7ad77f1a97b9697b3761802de5b82983d.zip
u-boot-imx-d18d49d7ad77f1a97b9697b3761802de5b82983d.tar.gz
u-boot-imx-d18d49d7ad77f1a97b9697b3761802de5b82983d.tar.bz2
mips: don't hardcode Malta env baudrate
The baudrate passed to Linux in the environment was hardcoded at 38400. Instead pass the correct baudrate from global data, allowing Linux to correctly inherit the baudrate used by U-boot when console setup is not explicitly specified. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
-rw-r--r--arch/mips/lib/bootm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 1febf29..71bb0d2 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -196,8 +196,10 @@ static void boot_prep_linux(bootm_headers_t *images)
if (cp)
linux_env_set("eth1addr", cp);
- if (mips_boot_malta)
- linux_env_set("modetty0", "38400n8r");
+ if (mips_boot_malta) {
+ sprintf(env_buf, "%un8r", gd->baudrate);
+ linux_env_set("modetty0", env_buf);
+ }
}
static void boot_jump_linux(bootm_headers_t *images)