diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-26 17:48:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-26 17:48:05 -0400 |
| commit | 79c884d7e449a63fa8f07b7495f8f9873355c48f (patch) | |
| tree | 19adcc1b9d3520a68937a1f5f81b06775c790d8a /arch/x86/lib/init_helpers.c | |
| parent | ad608a21f89bf7467059ed59d60b080aace7ef99 (diff) | |
| parent | f4b5db7c5309dd7f3ecc6369f3c1f41e8bfe93ae (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/init_helpers.c')
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 4fd47fc036..82fd5c3577 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -4,12 +4,10 @@ * * SPDX-License-Identifier: GPL-2.0+ */ + #include <common.h> -#include <fdtdec.h> -#include <spi.h> #include <asm/errno.h> #include <asm/mtrr.h> -#include <asm/sections.h> DECLARE_GLOBAL_DATA_PTR; @@ -19,53 +17,6 @@ __weak ulong board_get_usable_ram_top(ulong total_size) return gd->ram_size; } -int calculate_relocation_address(void) -{ - const ulong uboot_size = (uintptr_t)&__bss_end - - (uintptr_t)&__text_start; - ulong total_size; - ulong dest_addr; - ulong fdt_size = 0; - -#if defined(CONFIG_OF_SEPARATE) && defined(CONFIG_OF_CONTROL) - if (gd->fdt_blob) - fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32); -#endif - total_size = ALIGN(uboot_size, 1 << 12) + CONFIG_SYS_MALLOC_LEN + - CONFIG_SYS_STACK_SIZE + fdt_size; - - dest_addr = board_get_usable_ram_top(total_size); - /* - * NOTE: All destination address are rounded down to 16-byte - * boundary to satisfy various worst-case alignment - * requirements - */ - dest_addr &= ~15; - -#if defined(CONFIG_OF_SEPARATE) && defined(CONFIG_OF_CONTROL) - /* - * If the device tree is sitting immediate above our image then we - * must relocate it. If it is embedded in the data section, then it - * will be relocated with other data. - */ - if (gd->fdt_blob) { - dest_addr -= fdt_size; - gd->new_fdt = (void *)dest_addr; - dest_addr &= ~15; - } -#endif - /* U-Boot is below the FDT */ - dest_addr -= uboot_size; - dest_addr &= ~((1 << 12) - 1); - gd->relocaddr = dest_addr; - gd->reloc_off = dest_addr - (uintptr_t)&__text_start; - - /* Stack is at the bottom, so it can grow down */ - gd->start_addr_sp = dest_addr - CONFIG_SYS_MALLOC_LEN; - - return 0; -} - int init_cache_f_r(void) { #if defined(CONFIG_X86_RESET_VECTOR) & !defined(CONFIG_HAVE_FSP) |