diff options
| author | Tom Rini <trini@ti.com> | 2013-02-12 19:03:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-12 19:03:59 -0500 |
| commit | 9c748e02d99476e6a08d55eadfd8776edffe1e2e (patch) | |
| tree | 74018fa9cefe7428a49b398355885b840687cf32 /arch/mips/lib | |
| parent | 1634e969189ea428bc5fb9cf7d70bb314c98fc4f (diff) | |
| parent | 04380c651a2ff0d1495822321d2b7668dcd02537 (diff) | |
| download | u-boot-imx-9c748e02d99476e6a08d55eadfd8776edffe1e2e.zip u-boot-imx-9c748e02d99476e6a08d55eadfd8776edffe1e2e.tar.gz u-boot-imx-9c748e02d99476e6a08d55eadfd8776edffe1e2e.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/lib')
| -rw-r--r-- | arch/mips/lib/board.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index d79e183..2ec0f76 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -143,7 +143,7 @@ void board_init_f(ulong bootflag) gd_t gd_data, *id; bd_t *bd; init_fnc_t **init_fnc_ptr; - ulong addr, addr_sp, len = (ulong)&uboot_end - CONFIG_SYS_MONITOR_BASE; + ulong addr, addr_sp, len; ulong *s; /* Pointer is writable since we allocated a register for it. @@ -176,6 +176,7 @@ void board_init_f(ulong bootflag) /* Reserve memory for U-Boot code, data & bss * round down to next 16 kB limit */ + len = bss_end() - CONFIG_SYS_MONITOR_BASE; addr -= len; addr &= ~(16 * 1024 - 1); @@ -261,18 +262,10 @@ void board_init_r(gd_t *id, ulong dest_addr) gd->reloc_off = dest_addr - CONFIG_SYS_MONITOR_BASE; - monitor_flash_len = (ulong)&uboot_end_data - dest_addr; + monitor_flash_len = image_copy_end() - dest_addr; serial_initialize(); -#if defined(CONFIG_NEEDS_MANUAL_RELOC) - /* - * We have to relocate the command table manually - */ - fixup_cmdtable(ll_entry_start(cmd_tbl_t, cmd), - ll_entry_count(cmd_tbl_t, cmd)); -#endif /* defined(CONFIG_NEEDS_MANUAL_RELOC) */ - /* there are some other pointer constants we must deal with */ #ifndef CONFIG_ENV_IS_NOWHERE env_name_spec += gd->reloc_off; @@ -283,7 +276,6 @@ void board_init_r(gd_t *id, ulong dest_addr) /* The Malloc area is immediately below the monitor copy in DRAM */ mem_malloc_init(CONFIG_SYS_MONITOR_BASE + gd->reloc_off - TOTAL_MALLOC_LEN, TOTAL_MALLOC_LEN); - malloc_bin_reloc(); #ifndef CONFIG_SYS_NO_FLASH /* configure available FLASH banks */ |