Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74800 )
Change subject: cpu/x86/entry16.S: Move reset vector to this file ......................................................................
cpu/x86/entry16.S: Move reset vector to this file
This makes the code easier to follow.
Signed-off-by: Arthur Heymans arthur@aheymans.xyz Change-Id: I5a4b7fe99875a1addf611f569990ff9a3beda3ba --- M src/cpu/x86/Makefile.inc M src/cpu/x86/entry16.S D src/cpu/x86/reset16.S 3 files changed, 18 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/74800/1
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index cb76343..d34decd 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -32,7 +32,6 @@
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 d045c54..5b58b67 100644 --- a/src/cpu/x86/entry16.S +++ b/src/cpu/x86/entry16.S @@ -151,3 +151,9 @@ .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 9cc85c9..0000000 --- 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
-
Arthur Heymans (Code Review)