diff options
| author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2019-12-20 12:26:44 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-26 10:48:17 +0000 |
| commit | f9ad22d9f7defafd5cccdb8cf40f28f6e9366425 (patch) | |
| tree | 7ed94a1fff385e85749e232628da6f79b3cbb433 | |
| parent | cca74861202b12033df87b72bad9e5b8b1fccf43 (diff) | |
| download | coreboot-f9ad22d9f7defafd5cccdb8cf40f28f6e9366425.tar.xz | |
src/x86|cpu/intel: Hardcode FIT and ID
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 <marshalldawson3rd@gmail.com>
Change-Id: I2c9d5e2b2c4248c999d493a72d90cfddd92197cf
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37877
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/arch/x86/id.ld | 2 | ||||
| -rw-r--r-- | 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)) } |