GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/broadwell: Drop vboot support 

There is an ongoing effort to deprecate VBOOT_VBNV_CMOS, and replace it
with VBOOT_VBNV_FLASH [1]. Since SOC_INTEL_BROADWELL doesn't support
flash writes in early stages (BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES),
drop vboot as well as ChromeOS support for all broadwell boards,
including auron, jecht and wtm2.

[1] https://issuetracker.google.com/issues/235293589

BUG=b:235293589
TEST=./util/abuild/abuild -t GOOGLE_GUADO -a
TEST=./util/abuild/abuild -t GOOGLE_BUDDY -a

Change-Id: I002ab0f5f281c098afba16ada3621f1539c66d6b
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65782
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Yu-Ping Wu 2022-06-23 16:40:42 +08:00 committed by Felix Held
parent 123bcb702a
commit f87489bbae
4 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/google/auron/Kconfig
View File

@ -8,7 +8,6 @@ config BOARD_GOOGLE_BASEBOARD_AURON
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select INTEL_INT15 select INTEL_INT15
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select MEMORY_MAPPED_TPM select MEMORY_MAPPED_TPM
select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_TPM1
@ -44,11 +43,6 @@ config BOARD_GOOGLE_SAMUS
if BOARD_GOOGLE_BASEBOARD_AURON if BOARD_GOOGLE_BASEBOARD_AURON
config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select VBOOT_LID_SWITCH
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR config MAINBOARD_DIR
default "google/auron" default "google/auron"

4
src/mainboard/google/jecht/Kconfig
View File

@ -5,7 +5,6 @@ config BOARD_GOOGLE_BASEBOARD_JECHT
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select MEMORY_MAPPED_TPM select MEMORY_MAPPED_TPM
select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_TPM1
@ -26,9 +25,6 @@ config BOARD_GOOGLE_TIDUS
if BOARD_GOOGLE_BASEBOARD_JECHT if BOARD_GOOGLE_BASEBOARD_JECHT
config VBOOT
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR config MAINBOARD_DIR
default "google/jecht" default "google/jecht"

4
src/mainboard/intel/wtm2/Kconfig
View File

@ -7,13 +7,9 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select MAINBOARD_HAS_CHROMEOS
select MEMORY_MAPPED_TPM select MEMORY_MAPPED_TPM
select INTEL_INT15 select INTEL_INT15
config VBOOT
select VBOOT_VBNV_CMOS
config MAINBOARD_DIR config MAINBOARD_DIR
default "intel/wtm2" default "intel/wtm2"

26
src/soc/intel/broadwell/Kconfig
View File

@ -13,25 +13,6 @@ config SOC_SPECIFIC_OPTIONS
select MRC_SETTINGS_PROTECT select MRC_SETTINGS_PROTECT
select REG_SCRIPT select REG_SCRIPT
config BROADWELL_VBOOT_IN_BOOTBLOCK
depends on VBOOT
bool "Start verstage in bootblock"
default y
select VBOOT_STARTS_IN_BOOTBLOCK
help
Broadwell can either start verstage in a separate stage
right after the bootblock has run or it can start it
after romstage for compatibility reasons.
Broadwell however uses a mrc.bin to initialize memory which
needs to be located at a fixed offset. Therefore even with
a separate verstage starting after the bootblock that same
binary is used meaning a jump is made from RW to the RO region
and back to the RW region after the binary is done.
config VBOOT
select VBOOT_MUST_REQUEST_DISPLAY
select VBOOT_STARTS_IN_ROMSTAGE if !BROADWELL_VBOOT_IN_BOOTBLOCK
config ECAM_MMCONF_BASE_ADDRESS config ECAM_MMCONF_BASE_ADDRESS
default 0xf0000000 default 0xf0000000
@ -97,13 +78,6 @@ config MRC_BIN_ADDRESS
hex hex
default 0xfffa0000 default 0xfffa0000
# The UEFI System Agent binary needs to be at a fixed offset in the flash
# and can therefore only reside in the COREBOOT fmap region
config RO_REGION_ONLY
string
depends on VBOOT
default "mrc.bin"
endif # HAVE_MRC endif # HAVE_MRC
config HAVE_REFCODE_BLOB config HAVE_REFCODE_BLOB