Change in coreboot[master]: src/x86|cpu/intel: Hardcode FIT and ID

[Marshall Dawson (Code Review)]

Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37877 )

Change subject: src/x86|cpu/intel: Hardcode FIT and ID
......................................................................

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 
Change-Id: I2c9d5e2b2c4248c999d493a72d90cfddd92197cf
---
M src/arch/x86/id.ld
M src/cpu/intel/fit/fit.ld
2 files changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/37877/1

diff --git a/src/arch/x86/id.ld b/src/arch/x86/id.ld
index 3d9ef37..2a50f9c 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 2e65186..6e30ea1 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))
    }

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37877 )

Change subject: src/x86|cpu/intel: Hardcode FIT and ID
......................................................................

Patch Set 1: Code-Review+1

[Martin Roth (Code Review)]

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37877 )

Change subject: src/x86|cpu/intel: Hardcode FIT and ID
......................................................................

Patch Set 1: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37877 )

Change subject: src/x86|cpu/intel: Hardcode FIT and ID
......................................................................

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 
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 
---
M src/arch/x86/id.ld
M src/cpu/intel/fit/fit.ld
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, but someone else must approve
  Martin Roth: Looks good to me, approved

diff --git a/src/arch/x86/id.ld b/src/arch/x86/id.ld
index 3d9ef37..2a50f9c 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 2e65186..6e30ea1 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))
    }