summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-11-22 00:47:04 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2021-01-28 08:52:35 +0000
commit404c0c455c4f9ae3b1c40f8fbe8328349b6b547d (patch)
tree4ea2c45ea0163369482d48d26ac73acd0081e9cd
parent0308313e07caf60ac77c416a448026c09351fe5d (diff)
downloadcoreboot-404c0c455c4f9ae3b1c40f8fbe8328349b6b547d.tar.xz
cpu/x86: Link reset16.inc
Change-Id: If2caab67286cf77e37928e03be4f581070e771d8 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47968 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/arch/x86/bootblock_crt0.S1
-rw-r--r--src/cpu/x86/Makefile.inc1
-rw-r--r--src/cpu/x86/reset16.S (renamed from src/cpu/x86/16bit/reset16.inc)1
3 files changed, 1 insertions, 2 deletions
diff --git a/src/arch/x86/bootblock_crt0.S b/src/arch/x86/bootblock_crt0.S
index 3e9065b707..16daed1b54 100644
--- a/src/arch/x86/bootblock_crt0.S
+++ b/src/arch/x86/bootblock_crt0.S
@@ -16,7 +16,6 @@
* Include the old code for reset vector and protected mode entry. That code has
* withstood the test of time.
*/
-#include <cpu/x86/16bit/reset16.inc>
#include <cpu/x86/32bit/entry32.inc>
#if CONFIG(BOOTBLOCK_DEBUG_SPINLOOP)
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc
index 393506b8e3..9112ddbe1b 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -9,6 +9,7 @@ ramstage-y += backup_default_smm.c
subdirs-$(CONFIG_CPU_INTEL_COMMON_SMM) += ../intel/smm
bootblock-y += entry16.S
+bootblock-y += reset16.S
additional-dirs += $(obj)/cpu/x86
diff --git a/src/cpu/x86/16bit/reset16.inc b/src/cpu/x86/reset16.S
index b5abb3d9ec..38580146b4 100644
--- a/src/cpu/x86/16bit/reset16.inc
+++ b/src/cpu/x86/reset16.S
@@ -12,4 +12,3 @@ _start:
* instead of the weird 16 bit relocations that binutils does not
* handle consistently between versions because they are used so rarely.
*/
- .previous