Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13881
-gerrit
commit 044bfedeca52afef5009628cba54e74f16ac3c2b Author: Aaron Durbin adurbin@chromium.org Date: Wed Mar 2 15:13:12 2016 -0600
arch/x86: rename reset_vector -> _start
In order to align the entry points for the various stages on x86 to _start one needs to rename the reset_vector symbol. The section is the same; it's just a symbol change.
Change-Id: I0e6bbf1da04a6e248781a9c222a146725c34268a Signed-off-by: Aaron Durbin adurbin@chromium.org --- src/arch/x86/failover.ld | 2 +- src/arch/x86/include/arch/header.ld | 2 +- src/cpu/x86/16bit/reset16.inc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/arch/x86/failover.ld b/src/arch/x86/failover.ld index c8c00bb..e9613d9 100644 --- a/src/arch/x86/failover.ld +++ b/src/arch/x86/failover.ld @@ -14,7 +14,7 @@ * GNU General Public License for more details. */
-ENTRY(reset_vector) +ENTRY(_start)
MEMORY { rom : ORIGIN = 0xffff0000, LENGTH = 64K diff --git a/src/arch/x86/include/arch/header.ld b/src/arch/x86/include/arch/header.ld index 89cb6de..d7fbf07 100644 --- a/src/arch/x86/include/arch/header.ld +++ b/src/arch/x86/include/arch/header.ld @@ -42,5 +42,5 @@ PHDRS #endif
#if IS_ENABLED(CONFIG_C_ENVIRONMENT_BOOTBLOCK) && ENV_BOOTBLOCK -ENTRY(reset_vector) +ENTRY(_start) #endif diff --git a/src/cpu/x86/16bit/reset16.inc b/src/cpu/x86/16bit/reset16.inc index d99f0b1..48cb275 100644 --- a/src/cpu/x86/16bit/reset16.inc +++ b/src/cpu/x86/16bit/reset16.inc @@ -1,7 +1,7 @@ .section ".reset", "ax", %progbits .code16 -.globl reset_vector -reset_vector: +.globl _start +_start: .byte 0xe9 .int _start16bit - ( . + 2 ) /* Note: The above jump is hand coded to work around bugs in binutils.