diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-07-02 21:48:38 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-07-06 06:17:47 +0000 |
| commit | 18a8ba41cc748c4c85fb2d9b0314dbc87c2003c1 (patch) | |
| tree | f54881cde95e01ce3eedd9969bdcecd6008a8a7f /src/arch/x86 | |
| parent | 7c040adc8c5aa00fabd315296aff4e70d5f03f7e (diff) | |
arch/x86: Remove RELOCATABLE_RAMSTAGE
We always have it, no need to support opting-out.
For PLATFORM_HAS_DRAM_CLEAR there is a dependency of ramstage
located inside CBMEM, which is only true with ARCH_X86.
Change-Id: I5cbf4063c69571db92de2d321c14d30c272e8098
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43014
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/arch/x86/gdt.c | 52 | ||||
| -rw-r--r-- | src/arch/x86/memlayout.ld | 3 |
3 files changed, 1 insertions, 59 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index b5352e7ab5..2adb294031 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -245,7 +245,6 @@ ramstage-y += cpu_common.c ramstage-y += ebda.c ramstage-y += exception.c ramstage-y += idt.S -ramstage-y += gdt.c ramstage-$(CONFIG_IOAPIC) += ioapic.c ramstage-y += memcpy.c ramstage-y += memmove.c @@ -291,14 +290,10 @@ endif ramstage-libs ?= -ifeq ($(CONFIG_RELOCATABLE_RAMSTAGE),y) - # The rmodule_link definition creates an elf file with .rmod extension. $(objcbfs)/ramstage.elf: $(objcbfs)/ramstage.debug.rmod cp $< $@ -endif - $(objcbfs)/ramstage.debug: $(objgenerated)/ramstage.o $(call src-to-obj,ramstage,$(CONFIG_MEMLAYOUT_LD_FILE)) @printf " CC $(subst $(obj)/,,$(@))\n" $(LD_ramstage) $(CPPFLAGS) $(LDFLAGS_ramstage) -o $@ -L$(obj) $< -T $(call src-to-obj,ramstage,$(CONFIG_MEMLAYOUT_LD_FILE)) diff --git a/src/arch/x86/gdt.c b/src/arch/x86/gdt.c deleted file mode 100644 index 9c855664cf..0000000000 --- a/src/arch/x86/gdt.c +++ /dev/null @@ -1,52 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <types.h> -#include <string.h> -#include <cbmem.h> -#include <commonlib/helpers.h> -#include <console/console.h> -#include <cpu/x86/gdt.h> - -/* i386 lgdt argument */ -struct gdtarg { - u16 limit; -#ifdef __x86_64__ - u64 base; -#else - u32 base; -#endif -} __packed; - -/* - * Copy GDT to new location and reload it. - * FIXME: We only do this for BSP CPU. - */ -static void move_gdt(int is_recovery) -{ - void *newgdt; - u16 num_gdt_bytes; - struct gdtarg gdtarg; - - /* ramstage is already in high memory. No need to use a new gdt. */ - if (CONFIG(RELOCATABLE_RAMSTAGE)) - return; - - newgdt = cbmem_find(CBMEM_ID_GDT); - num_gdt_bytes = (uintptr_t)&gdt_end - (uintptr_t)&gdt; - if (!newgdt) { - newgdt = cbmem_add(CBMEM_ID_GDT, ALIGN_UP(num_gdt_bytes, 512)); - if (!newgdt) { - printk(BIOS_ERR, "Error: Could not relocate GDT.\n"); - return; - } - memcpy((void *)newgdt, &gdt, num_gdt_bytes); - } - printk(BIOS_DEBUG, "Moving GDT to %p...", newgdt); - - gdtarg.base = (uintptr_t)newgdt; - gdtarg.limit = num_gdt_bytes - 1; - - __asm__ __volatile__ ("lgdt %0\n\t" : : "m" (gdtarg)); - printk(BIOS_DEBUG, "ok\n"); -} -RAMSTAGE_CBMEM_INIT_HOOK(move_gdt) diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld index 12974ca09a..3659cc9f96 100644 --- a/src/arch/x86/memlayout.ld +++ b/src/arch/x86/memlayout.ld @@ -13,8 +13,7 @@ SECTIONS * conditionalize with macros. */ #if ENV_RAMSTAGE - RAMSTAGE(CONFIG_RAMBASE, (CONFIG(RELOCATABLE_RAMSTAGE) ? 8M : - CONFIG_RAMTOP - CONFIG_RAMBASE)) + RAMSTAGE(CONFIG_RAMBASE, 8M) #elif ENV_ROMSTAGE /* The 1M size is not allocated. It's just for basic size checking. |