From f0c27993e42e801b1bd0c168809ccdbc5e05f9f3 Mon Sep 17 00:00:00 2001 From: Daniel Schwierzeck Date: Wed, 12 Dec 2012 13:13:48 +0100 Subject: MIPS: constify mips_io_port_base mips_io_port_base is exported as 'extern const unsigned long mips_io_port_base;' in arch/mips/include/asm/io.h. Thus make the variable const too. Signed-off-by: Daniel Schwierzeck --- arch/mips/lib/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index 7ddd77832cc..4f330ccf7d7 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -46,7 +46,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) { -- cgit v1.2.3 From f88e09de8d4ce7307c6aaf3a3adff53e85b4b5b3 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Tue, 11 Dec 2012 17:52:50 +0000 Subject: mips: serial: Fix busted manual relocation serial_initialize() must be called after relocation to adjust the pointers to putc(), getc(), etc. This is busted ever since the serial driver-model-ification series. Signed-off-by: Joe Hershberger Signed-off-by: Daniel Schwierzeck --- arch/mips/lib/board.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index 4f330ccf7d7..d79e1837d9a 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -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 -- cgit v1.2.3