diff options
| author | Patrick Georgi <patrick@coreboot.org> | 2023-11-24 14:39:56 +0100 |
|---|---|---|
| committer | Patrick Georgi <patrick@coreboot.org> | 2023-11-25 13:55:22 +0000 |
| commit | 47282a90debed401ba0110bff06c0a3f837a20bd (patch) | |
| tree | db2ca0d3596e22488251cf8571714b925786e336 | |
| parent | b6954fa16f2a9b888991d92a6fd2759fae47aaf1 (diff) | |
| download | coreboot-47282a90debed401ba0110bff06c0a3f837a20bd.tar.gz coreboot-47282a90debed401ba0110bff06c0a3f837a20bd.tar.bz2 coreboot-47282a90debed401ba0110bff06c0a3f837a20bd.zip | |
tree wide: Rename VBOOT_MEASURED_BOOT* to TPM_MEASURED_BOOT
This follows commit c79e96b4eb3 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>
| -rw-r--r-- | Documentation/mainboard/lenovo/vboot.md | 2 | ||||
| -rw-r--r-- | Documentation/security/vboot/measured_boot.md | 2 | ||||
| -rw-r--r-- | configs/config.google_octopus_spi_flash_console | 2 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Makefile.inc | 2 | ||||
| -rwxr-xr-x | util/abuild/abuild | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/mainboard/lenovo/vboot.md b/Documentation/mainboard/lenovo/vboot.md index 0a451ab7c4b6..eb7158335546 100644 --- a/Documentation/mainboard/lenovo/vboot.md +++ b/Documentation/mainboard/lenovo/vboot.md @@ -9,7 +9,7 @@ updates using an A/B partitioning scheme once enabled. ## Enabling vboot You can enable [vboot] in Kconfig's *Security* section. Besides a verified 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. ## Updating and recovery diff --git a/Documentation/security/vboot/measured_boot.md b/Documentation/security/vboot/measured_boot.md index c8014c2dfd18..9866285c6eab 100644 --- a/Documentation/security/vboot/measured_boot.md +++ b/Documentation/security/vboot/measured_boot.md @@ -68,7 +68,7 @@ specific IBB measurements without hard-coding them. #### Runtime Data * 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) in order to avoid PCR pre-calculation issues. diff --git a/configs/config.google_octopus_spi_flash_console b/configs/config.google_octopus_spi_flash_console index df8889b01965..570528b1c0e3 100644 --- a/configs/config.google_octopus_spi_flash_console +++ b/configs/config.google_octopus_spi_flash_console @@ -1,4 +1,4 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_OCTOPUS=y CONFIG_CONSOLE_SPI_FLASH=y -# CONFIG_VBOOT_MEASURED_BOOT is not set +# CONFIG_TPM_MEASURED_BOOT is not set diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index 47bdf0f587fd..93f3a920f612 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -26,7 +26,7 @@ verstage-y += gpio.c verstage-y += i2c.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 += BiosCallOuts.c diff --git a/util/abuild/abuild b/util/abuild/abuild index 4bdf7ee6bcf4..1adf0462fff4 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -883,7 +883,7 @@ while true ; do chromeos=true testclass=chromeos customizing="${customizing}, chromeos" - configoptions="${configoptions}CONFIG_CHROMEOS=y\nCONFIG_VBOOT_MEASURED_BOOT=y\n" + configoptions="${configoptions}CONFIG_CHROMEOS=y\n" ;; -X|--xmlfile) shift XMLFILE=$1 |