[coreboot-gerrit] Change in coreboot[master]: [WIP] soc/amd: Remove Kconfig X86_RESET_VECTOR

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

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48405 )

Change subject: [WIP] soc/amd: Remove Kconfig X86_RESET_VECTOR
......................................................................

[WIP] soc/amd: Remove Kconfig X86_RESET_VECTOR

The architectural requirement is for the address to be
located at the end of bootblock -0x10 bytes, so the
definition was redundant with other Kconfig variables.

Change-Id: Ia014470cfadf0b401a12a2de6dce3b1fc1862137
Signed-off-by: Kyösti Mälkki 
---
M src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
M src/soc/amd/picasso/Kconfig
2 files changed, 3 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/48405/1

diff --git a/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld b/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
index 2ae72e3..e595065 100644
--- a/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
+++ b/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
@@ -84,7 +84,6 @@
 #if CONFIG(VBOOT)
    PSP_SHAREDMEM_DRAM_END(CONFIG_PSP_SHAREDMEM_BASE + CONFIG_PSP_SHAREDMEM_SIZE)
 #endif
-	_ = ASSERT((CONFIG_BOOTBLOCK_ADDR + CONFIG_C_ENV_BOOTBLOCK_SIZE - 0x10) == CONFIG_X86_RESET_VECTOR, "Reset vector should be -0x10 from end of bootblock");
    _ = ASSERT(CONFIG_BOOTBLOCK_ADDR == ((CONFIG_BOOTBLOCK_ADDR + 0xFFFF) & 0xFFFF0000), "Bootblock must be 16 bit aligned");
    BOOTBLOCK(CONFIG_BOOTBLOCK_ADDR, CONFIG_C_ENV_BOOTBLOCK_SIZE)
    ROMSTAGE(CONFIG_ROMSTAGE_ADDR, CONFIG_ROMSTAGE_SIZE)
@@ -105,10 +104,11 @@

SECTIONS {
    /* Trigger an error if I have an unusable start address */
-	_TOO_LOW = CONFIG_X86_RESET_VECTOR - 0xfff0;
+	_TOO_LOW = _X86_RESET_VECTOR - 0xfff0;
    _bogus = ASSERT(_start16bit >= _TOO_LOW, "_start16bit too low. Please report.");

-	. = CONFIG_X86_RESET_VECTOR;
+	. = CONFIG_BOOTBLOCK_ADDR + CONFIG_C_ENV_BOOTBLOCK_SIZE - 0x10;
+	_X86_RESET_VECTOR = .;
    .reset . : {
    	*(.reset);
    	. = 15;
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 79fc3be..fcb7ddb 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -134,15 +134,6 @@
      This variable controls the DRAM allocation size in linker script
      for bootblock stage.

-config X86_RESET_VECTOR
-	hex
-	depends on ARCH_X86
-	default 0x203fff0
-	help
-	  Sets the reset vector within bootblock where x86 starts execution.
-	  Reset vector is supposed to live at offset -0x10 from end of
-	  bootblock i.e. BOOTBLOCK_ADDR + C_ENV_BOOTBLOCK_SIZE - 0x10.
-
 config ROMSTAGE_ADDR
    hex
    default 0x2040000