linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini
2012-12-12 06:51:02 -07:00
parent bf3d58bb7d f88e09de8d
commit caddc17f30
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/mips/lib/board.c
View File

@ -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";
* 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)
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