From b156ff09aad5a54b5a47b940ebc26aeeae56ee07 Mon Sep 17 00:00:00 2001 From: Graeme Russ Date: Fri, 23 Dec 2011 15:57:58 +1100 Subject: x86: Move relocation code out of board.c --- arch/x86/lib/board.c | 69 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 67 deletions(-) (limited to 'arch/x86/lib/board.c') diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 416aa9e5f6..bebb347208 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #ifdef CONFIG_BITBANGMII @@ -117,9 +116,6 @@ static void display_flash_config(ulong size) typedef int (init_fnc_t) (void); static int calculate_relocation_address(void); -static int copy_uboot_to_ram(void); -static int clear_bss(void); -static int do_elf_reloc_fixups(void); static int copy_gd_to_ram(void); init_fnc_t *init_sequence_f[] = { @@ -183,59 +179,6 @@ static int calculate_relocation_address(void) return 0; } -static int copy_uboot_to_ram(void) -{ - size_t len = (size_t)&__data_end - (size_t)&__text_start; - - memcpy((void *)gd->relocaddr, (void *)&__text_start, len); - - return 0; -} - -static int clear_bss(void) -{ - ulong dst_addr = (ulong)&__bss_start + gd->reloc_off; - size_t len = (size_t)&__bss_end - (size_t)&__bss_start; - - memset((void *)dst_addr, 0x00, len); - - return 0; -} - -static int do_elf_reloc_fixups(void) -{ - Elf32_Rel *re_src = (Elf32_Rel *)(&__rel_dyn_start); - Elf32_Rel *re_end = (Elf32_Rel *)(&__rel_dyn_end); - - Elf32_Addr *offset_ptr_rom; - Elf32_Addr *offset_ptr_ram; - - /* The size of the region of u-boot that runs out of RAM. */ - uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start; - - do { - /* Get the location from the relocation entry */ - offset_ptr_rom = (Elf32_Addr *)re_src->r_offset; - - /* Check that the location of the relocation is in .text */ - if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE) { - - /* Switch to the in-RAM version */ - offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom + - gd->reloc_off); - - /* Check that the target points into .text */ - if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE && - *offset_ptr_ram < - (CONFIG_SYS_TEXT_BASE + size)) { - *offset_ptr_ram += gd->reloc_off; - } - } - } while (re_src++ < re_end); - - return 0; -} - /* Load U-Boot into RAM, initialize BSS, perform relocation adjustments */ void board_init_f(ulong boot_flags) { @@ -270,17 +213,9 @@ void board_init_f_r(void) if (init_cache() != 0) hang(); - copy_uboot_to_ram(); - clear_bss(); - do_elf_reloc_fixups(); - - /* - * Transfer execution from Flash to RAM by calculating the address - * of the in-RAM copy of board_init_r() and calling it - */ - (board_init_r + gd->reloc_off)(gd, gd->relocaddr); + relocate_code(0, gd, 0); - /* NOTREACHED - board_init_r() does not return */ + /* NOTREACHED - relocate_code() does not return */ while (1) ; } -- cgit v1.2.1