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

tree wide: Rename VBOOT_MEASURED_BOOT* to TPM_MEASURED_BOOT 

This follows commit c79e96b4eb which did the rename across the tree
except in these places. Remove the flag from CHROMEOS abuild builds
because it never really belonged there.

Change-Id: If98fa27f64d6b676d3edf68ba6fbaacf7ac422e4
Signed-off-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79258
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
This commit is contained in:
Patrick Georgi 2023-11-24 14:39:56 +01:00
parent b6954fa16f
commit 47282a90de
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/mainboard/lenovo/vboot.md
View File

@ -9,7 +9,7 @@ updates using an A/B partitioning scheme once enabled.
## Enabling vboot ## Enabling vboot
You can enable [vboot] in Kconfig's *Security* section. Besides a verified You can enable [vboot] in Kconfig's *Security* section. Besides a verified
boot you can also enable a measured boot by setting boot you can also enable a measured boot by setting
`CONFIG_VBOOT_MEASURED_BOOT`. Both options need a working TPM, which is `CONFIG_TPM_MEASURED_BOOT`. Both options need a working TPM, which is
present on all recent Lenovo devices. present on all recent Lenovo devices.
## Updating and recovery ## Updating and recovery

2
Documentation/security/vboot/measured_boot.md
View File

@ -68,7 +68,7 @@ specific IBB measurements without hard-coding them.
#### Runtime Data #### Runtime Data
* CBFS data which changes by external input dynamically. Never stays the same. * CBFS data which changes by external input dynamically. Never stays the same.
* It is identified by VBOOT_MEASURED_BOOT_RUNTIME_DATA kconfig option and * It is identified by TPM_MEASURED_BOOT_RUNTIME_DATA kconfig option and
measured into a different PCR (PCR_RUNTIME_DATA kconfig option, 3 by default) measured into a different PCR (PCR_RUNTIME_DATA kconfig option, 3 by default)
in order to avoid PCR pre-calculation issues. in order to avoid PCR pre-calculation issues.

2
configs/config.google_octopus_spi_flash_console
View File

@ -1,4 +1,4 @@
CONFIG_VENDOR_GOOGLE=y CONFIG_VENDOR_GOOGLE=y
CONFIG_BOARD_GOOGLE_OCTOPUS=y CONFIG_BOARD_GOOGLE_OCTOPUS=y
CONFIG_CONSOLE_SPI_FLASH=y CONFIG_CONSOLE_SPI_FLASH=y
# CONFIG_VBOOT_MEASURED_BOOT is not set # CONFIG_TPM_MEASURED_BOOT is not set

2
src/soc/amd/stoneyridge/Makefile.inc
View File

@ -26,7 +26,7 @@ verstage-y += gpio.c
verstage-y += i2c.c verstage-y += i2c.c
postcar-y += memmap.c postcar-y += memmap.c
postcar-$(CONFIG_VBOOT_MEASURED_BOOT) += i2c.c postcar-$(CONFIG_TPM_MEASURED_BOOT) += i2c.c
ramstage-y += aoac.c ramstage-y += aoac.c
ramstage-y += BiosCallOuts.c ramstage-y += BiosCallOuts.c

2
util/abuild/abuild
View File

@ -883,7 +883,7 @@ while true ; do
chromeos=true chromeos=true
testclass=chromeos testclass=chromeos
customizing="${customizing}, chromeos" customizing="${customizing}, chromeos"
configoptions="${configoptions}CONFIG_CHROMEOS=y\nCONFIG_VBOOT_MEASURED_BOOT=y\n" configoptions="${configoptions}CONFIG_CHROMEOS=y\n"
;; ;;
-X|--xmlfile) shift -X|--xmlfile) shift
XMLFILE=$1 XMLFILE=$1