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@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>