From f9ad22d9f7defafd5cccdb8cf40f28f6e9366425 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Fri, 20 Dec 2019 12:26:44 -0700 Subject: [PATCH] src/x86|cpu/intel: Hardcode FIT and ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert two of the changes made in "arch|cpu/x86: Add Kconfig option for x86 reset vector" I6a814f7179ee4251aeeccb2555221616e944e03d The Intel FIT pointer and the ID section should be offsets from the top of flash, and aren't inherently tied to the reset vector or to bootblock. Signed-off-by: Marshall Dawson Change-Id: I2c9d5e2b2c4248c999d493a72d90cfddd92197cf Reviewed-on: https://review.coreboot.org/c/coreboot/+/37877 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki Reviewed-by: Martin Roth --- src/arch/x86/id.ld | 2 +- src/cpu/intel/fit/fit.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/x86/id.ld b/src/arch/x86/id.ld index 3d9ef37ab9..2a50f9ca4f 100644 --- a/src/arch/x86/id.ld +++ b/src/arch/x86/id.ld @@ -12,7 +12,7 @@ */ SECTIONS { - . = (CONFIG_X86_RESET_VECTOR - CONFIG_ID_SECTION_OFFSET) - (__id_end - __id_start) + 0x10; + . = (0xffffffff - CONFIG_ID_SECTION_OFFSET) - (__id_end - __id_start) + 1; .id (.): { KEEP(*(.id)) } diff --git a/src/cpu/intel/fit/fit.ld b/src/cpu/intel/fit/fit.ld index 2e65186e40..6e30ea168a 100644 --- a/src/cpu/intel/fit/fit.ld +++ b/src/cpu/intel/fit/fit.ld @@ -12,7 +12,7 @@ */ SECTIONS { - . = CONFIG_X86_RESET_VECTOR - 0x30; /* 0xffffffc0 */ + . = 0xffffffc0; .fit_pointer (.): { KEEP(*(.fit_pointer)) }