Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/79258?usp=email )
Change subject: tree wide: Rename VBOOT_MEASURED_BOOT* to TPM_MEASURED_BOOT ......................................................................
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 --- M Documentation/mainboard/lenovo/vboot.md M Documentation/security/vboot/measured_boot.md M configs/config.google_octopus_spi_flash_console M src/soc/amd/stoneyridge/Makefile.inc M util/abuild/abuild 5 files changed, 5 insertions(+), 5 deletions(-)
Approvals: Arthur Heymans: Looks good to me, approved Felix Singer: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/Documentation/mainboard/lenovo/vboot.md b/Documentation/mainboard/lenovo/vboot.md index 0a451ab..eb71583 100644 --- a/Documentation/mainboard/lenovo/vboot.md +++ b/Documentation/mainboard/lenovo/vboot.md @@ -9,7 +9,7 @@ ## 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 c8014c2..9866285 100644 --- a/Documentation/security/vboot/measured_boot.md +++ b/Documentation/security/vboot/measured_boot.md @@ -68,7 +68,7 @@
#### 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 df8889b..570528b 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 47bdf0f..93f3a92 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -26,7 +26,7 @@ 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 4bdf7ee..1adf0462 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -883,7 +883,7 @@ 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