summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-12-12 06:51:02 -0700
committerTom Rini <trini@ti.com>2012-12-12 06:51:02 -0700
commitcaddc17f3019a437b972cd04a8c9a9cbea344def (patch)
tree53d68071b396fb150503cc0f5ae94e54875032d0
parentbf3d58bb7dc5dd4a2b15dd20663040ef43c5f795 (diff)
parentf88e09de8d4ce7307c6aaf3a3adff53e85b4b5b3 (diff)
downloadu-boot-imx-caddc17f3019a437b972cd04a8c9a9cbea344def.zip
u-boot-imx-caddc17f3019a437b972cd04a8c9a9cbea344def.tar.gz
u-boot-imx-caddc17f3019a437b972cd04a8c9a9cbea344def.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mips
-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 7ddd778..d79e183 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