From 2709ae443bb9cbb6f5e14fded1b73aa692e580f6 Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Mon, 1 Sep 2025 17:00:18 +0200 Subject: [PATCH] cpu/x86/entry16.S: Move reset vector to this file This makes the code easier to follow. Change-Id: I5a4b7fe99875a1addf611f569990ff9a3beda3ba Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/74800 Reviewed-by: Elyes Haouas Reviewed-by: Shuo Liu Tested-by: build bot (Jenkins) --- src/cpu/x86/Makefile.mk | 1 - src/cpu/x86/entry16.S | 6 ++++++ src/cpu/x86/reset16.S | 7 ------- 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 src/cpu/x86/reset16.S diff --git a/src/cpu/x86/Makefile.mk b/src/cpu/x86/Makefile.mk index 26e5d9c9c2..d9fbf2fddc 100644 --- a/src/cpu/x86/Makefile.mk +++ b/src/cpu/x86/Makefile.mk @@ -34,7 +34,6 @@ subdirs-$(CONFIG_CPU_INTEL_COMMON_SMM) += ../intel/smm bootblock-y += entry32.S bootblock-y += entry16.S -bootblock-y += reset16.S additional-dirs += $(obj)/cpu/x86 diff --git a/src/cpu/x86/entry16.S b/src/cpu/x86/entry16.S index b19ffa5d6a..ca2eb6067b 100644 --- a/src/cpu/x86/entry16.S +++ b/src/cpu/x86/entry16.S @@ -151,3 +151,9 @@ nullidt: .word 0 /* limit */ .long 0 .word 0 + + /* This is the first instruction the CPU runs when coming out of reset. */ +.section ".reset", "ax", %progbits +.globl _start +_start: + jmp _start16bit diff --git a/src/cpu/x86/reset16.S b/src/cpu/x86/reset16.S deleted file mode 100644 index 9cc85c9746..0000000000 --- a/src/cpu/x86/reset16.S +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - - .section ".reset", "ax", %progbits - .code16 -.globl _start -_start: - jmp _start16bit