diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-11-22 00:34:13 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-28 08:51:40 +0000 |
| commit | 0308313e07caf60ac77c416a448026c09351fe5d (patch) | |
| tree | 35137c15639b49a08f7e7225643d6fee1d6b80f7 /src | |
| parent | 952e6b1ef8601edda9eee5e2a539aa349fd9efc2 (diff) | |
cpu/x86: Link entry16.inc
Change-Id: I78ecd15716169b58cf6696ff8c5069ac2d5038ef
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47967
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/bootblock_crt0.S | 3 | ||||
| -rw-r--r-- | src/cpu/x86/32bit/entry32.inc | 1 | ||||
| -rw-r--r-- | src/cpu/x86/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/x86/entry16.S (renamed from src/cpu/x86/16bit/entry16.inc) | 8 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/arch/x86/bootblock_crt0.S b/src/arch/x86/bootblock_crt0.S index 387920e38a..3e9065b707 100644 --- a/src/arch/x86/bootblock_crt0.S +++ b/src/arch/x86/bootblock_crt0.S @@ -10,13 +10,12 @@ #include <cpu/x86/cr.h> -.section .init._start, "ax", @progbits +.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/16bit/entry16.inc> #include <cpu/x86/16bit/reset16.inc> #include <cpu/x86/32bit/entry32.inc> diff --git a/src/cpu/x86/32bit/entry32.inc b/src/cpu/x86/32bit/entry32.inc index 873a809616..b28fa2f37e 100644 --- a/src/cpu/x86/32bit/entry32.inc +++ b/src/cpu/x86/32bit/entry32.inc @@ -13,6 +13,7 @@ */ .align 4 +.globl __protected_start __protected_start: /* Save the BIST value */ movl %eax, %ebp diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index cd73b72fe3..393506b8e3 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -8,6 +8,8 @@ ramstage-y += backup_default_smm.c subdirs-$(CONFIG_CPU_INTEL_COMMON_SMM) += ../intel/smm +bootblock-y += entry16.S + additional-dirs += $(obj)/cpu/x86 SIPI_ELF=$(obj)/cpu/x86/sipi_vector.elf diff --git a/src/cpu/x86/16bit/entry16.inc b/src/cpu/x86/entry16.S index 5e90da1413..1ecd6ed422 100644 --- a/src/cpu/x86/16bit/entry16.inc +++ b/src/cpu/x86/entry16.S @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + /* * This software and ancillary information (herein called SOFTWARE) * called LinuxBIOS is made available under the terms described here. @@ -28,8 +30,10 @@ #include <arch/rom_segs.h> #include <cpu/x86/post_code.h> -/* Symbol _start16bit must be aligned to 4kB to start AP CPUs with - * Startup IPI message without RAM. +.section .init._start, "ax", @progbits + +/* Symbol _start16bit must reachable from the reset vector, and be aligned to + * 4kB to start AP CPUs with Startup IPI message without RAM. */ .align 4096 .code16 |