Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42348 )
Change subject: Revert "arch|cpu/x86: Add Kconfig option for x86 reset vector"
......................................................................
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(a)gmail.com>
---
M src/arch/x86/Kconfig
M src/arch/x86/id.ld
M src/arch/x86/memlayout.ld
M src/cpu/x86/16bit/reset16.ld
4 files changed, 9 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/42348/1
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 18c1ed3..35f63ac 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -73,16 +73,6 @@
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 ea8d7e9..b69a8dc 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 12974ca..6f7ac89 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -29,7 +29,7 @@
#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 b90dd04..e00e0b4 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;
--
To view, visit https://review.coreboot.org/c/coreboot/+/42348
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ib6b2cc2b17133b3207758c72a54abe80fc6356b5
Gerrit-Change-Number: 42348
Gerrit-PatchSet: 1
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-MessageType: newchange
Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42226 )
Change subject: mb/google/zork: Enable psp_verstage
......................................................................
mb/google/zork: Enable psp_verstage
Finally enable psp_verstage for zork.
Signed-off-by: Martin Roth <martin(a)coreboot.org>
Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5
---
M src/mainboard/google/zork/Kconfig
A src/mainboard/google/zork/memlayout.ld
2 files changed, 35 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42226/1
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 9a2e373..aca5640 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -88,8 +88,6 @@
config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_LID_SWITCH
- select VBOOT_STARTS_IN_BOOTBLOCK
- select VBOOT_SEPARATE_VERSTAGE
config VBOOT_VBNV_OFFSET
hex
@@ -122,6 +120,21 @@
depends on USE_OEM_BIN
default ""
+#TODO: Change these to get the postition from the FMAP file
+config PICASSO_FW_A_POSITION
+ hex
+ default 0xFF031040
+ depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK
+ help
+ Location of the AMD firmware in the RW_A region.
+
+config PICASSO_FW_B_POSITION
+ hex
+ default 0xFF3CF040
+ depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK
+ help
+ Location of the AMD firmware in the RW_B region
+
config VARIANT_HAS_FW_CONFIG
bool
help
@@ -134,4 +147,21 @@
help
Which board version did FW_CONFIG become valid in CBI.
+config VBOOT_STARTS_BEFORE_BOOTBLOCK
+ bool "PSP verstage"
+ depends on HAVE_PRE_BOOTBLOCK_VBOOT_SUPPORT
+ default y if VBOOT
+ help
+ Firmware verification happens before the main processor is brought
+ online.
+
+config VBOOT_STARTS_IN_BOOTBLOCK
+ bool "X86 verstage (in bootblock)"
+ depends on VBOOT && ! VBOOT_STARTS_BEFORE_BOOTBLOCK
+ select VBOOT_SEPARATE_VERSTAGE
+ help
+ Firmware verification happens during the end of or right after the
+ bootblock. This implies that a static VBOOT2_WORK() buffer must be
+ allocated in memlayout.
+
endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
diff --git a/src/mainboard/google/zork/memlayout.ld b/src/mainboard/google/zork/memlayout.ld
new file mode 100644
index 0000000..5493e0d
--- /dev/null
+++ b/src/mainboard/google/zork/memlayout.ld
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <soc/memlayout.ld>
--
To view, visit https://review.coreboot.org/c/coreboot/+/42226
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5
Gerrit-Change-Number: 42226
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-MessageType: newchange