diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-11-22 00:55:31 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-28 08:53:07 +0000 |
| commit | 47d58e5df0a5d1a96e64408c3c9384024d5ddaa3 (patch) | |
| tree | bdb073336a4fccb1b39fc8aebdc2d2726ec9d7aa /src/arch/x86 | |
| parent | 404c0c455c4f9ae3b1c40f8fbe8328349b6b547d (diff) | |
cpu/x86: Link entry32.inc
Change-Id: Ib475f40f950f8cc54f0e3c50a80970ba3d2b628f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47969
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/x86/bootblock_crt0.S | 53 |
2 files changed, 0 insertions, 55 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index cfefec605f..7dea2ce906 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -85,8 +85,6 @@ bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c $(call src-to-obj,bootblock,$(dir)/id.S): $(obj)/build.h -bootblock-y += bootblock_crt0.S - ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y) $(eval $(call early_x86_stage,bootblock,elf32-i386)) else diff --git a/src/arch/x86/bootblock_crt0.S b/src/arch/x86/bootblock_crt0.S deleted file mode 100644 index 16daed1b54..0000000000 --- a/src/arch/x86/bootblock_crt0.S +++ /dev/null @@ -1,53 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * This is the modern bootblock. It prepares the system for C environment runtime - * setup. The actual setup is done by hardware-specific code. - * - * It provides a bootflow similar to other architectures, and thus is considered - * to be the modern approach. - * - */ - -#include <cpu/x86/cr.h> - -.section .init, "ax", @progbits - -/* - * Include the old code for reset vector and protected mode entry. That code has - * withstood the test of time. - */ -#include <cpu/x86/32bit/entry32.inc> - -#if CONFIG(BOOTBLOCK_DEBUG_SPINLOOP) - - /* Wait for a JTAG debugger to break in and set EBX non-zero */ - xor %ebx, %ebx - -debug_spinloop: - cmp $0, %ebx - jz debug_spinloop -#endif - -bootblock_protected_mode_entry: - -#if !CONFIG(USE_MARCH_586) - /* MMX registers required here */ - - /* BIST result in eax */ - movd %eax, %mm0 - - /* Get an early timestamp */ - rdtsc - movd %eax, %mm1 - movd %edx, %mm2 -#endif - -#if CONFIG(SSE) -enable_sse: - mov %cr4, %eax - or $CR4_OSFXSR, %ax - mov %eax, %cr4 -#endif /* CONFIG(SSE) */ - - /* We're done. Now it's up to platform-specific code */ - jmp bootblock_pre_c_entry |