summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-13 21:22:56 +0300
committerFelix Held <felix-coreboot@felixheld.de>2020-11-17 07:46:34 +0000
commit123a37ed3607a042e77405b5e2235880e223201c (patch)
tree033920cc1c9ebd9f3b70248ba77e228d2c1beeb8
parent1eaf64c723588d5fc9854d797d33ef0246b35b43 (diff)
downloadcoreboot-123a37ed3607a042e77405b5e2235880e223201c.tar.xz
Revert "arch|cpu/x86: Add Kconfig option for x86 reset vector"
This partially reverts commit 67910db907fb3d5feacdbfaa40952a88f673795a. The symbol X86_RESET_VECTOR continues to live, for the time being, under soc/amd/picasso. Change-Id: Ib6b2cc2b17133b3207758c72a54abe80fc6356b5 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47596 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
-rw-r--r--src/arch/x86/Kconfig10
-rw-r--r--src/arch/x86/id.ld2
-rw-r--r--src/arch/x86/memlayout.ld2
-rw-r--r--src/cpu/x86/16bit/reset16.ld12
4 files changed, 9 insertions, 17 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 900c9c1e10..b5e52e6ecf 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -88,16 +88,6 @@ config AP_IN_SIPI_WAIT
default n
depends on ARCH_X86 && SMP
-config X86_RESET_VECTOR
- hex
- depends on ARCH_X86
- default 0xfffffff0
- help
- Specify the location of the x86 reset vector. In traditional devices
- this must match the architectural reset vector to produce a bootable
- image. Nontraditional designs may use this to position the reset
- vector into its desired location.
-
config RESET_VECTOR_IN_RAM
bool
depends on ARCH_X86
diff --git a/src/arch/x86/id.ld b/src/arch/x86/id.ld
index ea8d7e9dbd..b69a8dc1a5 100644
--- a/src/arch/x86/id.ld
+++ b/src/arch/x86/id.ld
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
SECTIONS {
- . = (CONFIG_X86_RESET_VECTOR - CONFIG_ID_SECTION_OFFSET) + 0x10 - (__id_end - __id_start);
+ . = (0xffffffff - CONFIG_ID_SECTION_OFFSET) - (__id_end - __id_start) + 1;
.id (.): {
KEEP(*(.id))
}
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld
index 3659cc9f96..cbf887cc1c 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -28,7 +28,7 @@ SECTIONS
#include "car.ld"
#elif ENV_BOOTBLOCK
- BOOTBLOCK(CONFIG_X86_RESET_VECTOR - CONFIG_C_ENV_BOOTBLOCK_SIZE + 0x10,
+ BOOTBLOCK(0xffffffff - CONFIG_C_ENV_BOOTBLOCK_SIZE + 1,
CONFIG_C_ENV_BOOTBLOCK_SIZE)
#include "car.ld"
diff --git a/src/cpu/x86/16bit/reset16.ld b/src/cpu/x86/16bit/reset16.ld
index b90dd04992..e00e0b41f8 100644
--- a/src/cpu/x86/16bit/reset16.ld
+++ b/src/cpu/x86/16bit/reset16.ld
@@ -1,13 +1,15 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* _RESET_VECTOR: typically the top of the ROM */
+/*
+ * _ROMTOP : The top of the ROM used where we
+ * need to put the reset vector.
+ */
SECTIONS {
/* Trigger an error if I have an unuseable start address */
- _TOO_LOW = CONFIG_X86_RESET_VECTOR - 0xfff0;
- _bogus = ASSERT(_start16bit >= _TOO_LOW, "_start16bit too low. Please report.");
-
- . = CONFIG_X86_RESET_VECTOR;
+ _bogus = ASSERT(_start16bit >= 0xffff0000, "_start16bit too low. Please report.");
+ _ROMTOP = 0xfffffff0;
+ . = _ROMTOP;
.reset . : {
*(.reset);
. = 15;