Skip to content
Snippets Groups Projects
Commit caddc17f authored by Tom Rini's avatar Tom Rini
Browse files

Merge branch 'master' of git://git.denx.de/u-boot-mips

parents bf3d58bb f88e09de
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <serial.h>
#include <stdio_dev.h> #include <stdio_dev.h>
#include <version.h> #include <version.h>
#include <net.h> #include <net.h>
...@@ -46,7 +47,7 @@ static char *failed = "*** failed ***\n"; ...@@ -46,7 +47,7 @@ static char *failed = "*** failed ***\n";
* mips_io_port_base is the begin of the address space to which x86 style * mips_io_port_base is the begin of the address space to which x86 style
* I/O ports are mapped. * 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) int __board_early_init_f(void)
{ {
...@@ -262,6 +263,8 @@ void board_init_r(gd_t *id, ulong dest_addr) ...@@ -262,6 +263,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
monitor_flash_len = (ulong)&uboot_end_data - dest_addr; monitor_flash_len = (ulong)&uboot_end_data - dest_addr;
serial_initialize();
#if defined(CONFIG_NEEDS_MANUAL_RELOC) #if defined(CONFIG_NEEDS_MANUAL_RELOC)
/* /*
* We have to relocate the command table manually * We have to relocate the command table manually
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment