common: Move board_get_usable_ram_top() out of common.h

[oweals/u-boot.git] / arch / x86 / lib / init_helpers.c

diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index 5097ca274a147f0965fc0935db69301945bc092a..5bb55e256fbb966aa047525671b27aaa3437e85d 100644 (file)
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -1,99 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011
  * Graeme Russ, <graeme.russ@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
+
 #include <common.h>
-#include <fdtdec.h>
-#include <spi.h>
-#include <asm/errno.h>
+#include <init.h>
+#include <linux/errno.h>
 #include <asm/mtrr.h>
-#include <asm/sections.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* Get the top of usable RAM */
-__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)
+       bool do_mtrr = CONFIG_IS_ENABLED(X86_32BIT_INIT) ||
+                IS_ENABLED(CONFIG_FSP_VERSION2);
        int ret;
 
-       ret = mtrr_commit(false);
-       /* If MTRR MSR is not implemented by the processor, just ignore it */
-       if (ret && ret != -ENOSYS)
-               return ret;
-#endif
+       do_mtrr &= !IS_ENABLED(CONFIG_FSP_VERSION1) &&
+               !IS_ENABLED(CONFIG_SYS_SLIMBOOTLOADER);
+
+       if (do_mtrr) {
+               ret = mtrr_commit(false);
+               /*
+                * If MTRR MSR is not implemented by the processor, just ignore
+                * it
+                */
+               if (ret && ret != -ENOSYS)
+                       return ret;
+       }
+
        /* Initialise the CPU cache(s) */
        return init_cache();
 }
-
-bd_t bd_data;
-
-int init_bd_struct_r(void)
-{
-       gd->bd = &bd_data;
-       memset(gd->bd, 0, sizeof(bd_t));
-
-       return 0;
-}
-
-int init_func_spi(void)
-{
-       puts("SPI:   ");
-       spi_init();
-       puts("ready\n");
-       return 0;
-}