aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/lib/board.c
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2012-12-14 16:03:55 -0600
committerScott Wood <scottwood@freescale.com>2012-12-14 16:03:55 -0600
commit88c5c68ffa277bf01b3254cf5a059e2cbe07be97 (patch)
treef56b444a1c85d94d6a386df090def099632489fe /arch/mips/lib/board.c
parent0b38fffbe413fc0725c750d046ca62c23fca196e (diff)
parent6e9005bd96ff0f0548a787ffafee10664a57a8e1 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'arch/mips/lib/board.c')
-rw-r--r--arch/mips/lib/board.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 7ddd77832c..d79e1837d9 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -24,6 +24,7 @@
#include <common.h>
#include <command.h>
#include <malloc.h>
+#include <serial.h>
#include <stdio_dev.h>
#include <version.h>
#include <net.h>
@@ -46,7 +47,7 @@ static char *failed = "*** failed ***\n";
* mips_io_port_base is the begin of the address space to which x86 style
* I/O ports are mapped.
*/
-unsigned long mips_io_port_base = -1;
+const unsigned long mips_io_port_base = -1;
int __board_early_init_f(void)
{
@@ -262,6 +263,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
monitor_flash_len = (ulong)&uboot_end_data - dest_addr;
+ serial_initialize();
+
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
/*
* We have to relocate the command table manually