diff options
| -rw-r--r-- | Documentation/drivers/smmstore.md | 2 | ||||
| -rw-r--r-- | Documentation/mainboard/index.md | 2 | ||||
| -rw-r--r-- | Documentation/mainboard/lenovo/vboot.md | 12 | ||||
| -rw-r--r-- | Documentation/releases/coreboot-4.11-relnotes.md | 2 | ||||
| -rw-r--r-- | Documentation/releases/coreboot-4.5-relnotes.md | 2 | ||||
| -rw-r--r-- | Documentation/releases/coreboot-4.6-relnotes.md | 2 | ||||
| -rw-r--r-- | Documentation/releases/coreboot-4.8.1-relnotes.md | 2 | ||||
| -rw-r--r-- | Documentation/security/vboot/index.md | 2 | ||||
| -rw-r--r-- | Documentation/security/vboot/list_vboot.md | 2 | ||||
| -rw-r--r-- | Documentation/security/vboot/measured_boot.md | 4 | ||||
| -rwxr-xr-x | util/vboot_list/vboot_list.sh | 2 |
11 files changed, 17 insertions, 17 deletions
diff --git a/Documentation/drivers/smmstore.md b/Documentation/drivers/smmstore.md index ecf937b1d0..53bac4dc9e 100644 --- a/Documentation/drivers/smmstore.md +++ b/Documentation/drivers/smmstore.md @@ -22,7 +22,7 @@ The API provides append-only semantics for key/value pairs. By default SMMSTORE will operate on a separate FMAP region called `SMMSTORE`. The default generated FMAP will include such a region. -On systems with a locked FMAP, e.g. in an existing VBOOT setup +On systems with a locked FMAP, e.g. in an existing vboot setup with a locked RO region, the option exists to add a cbfsfile called `smm_store` in the `RW_LEGACY` (if CHROMEOS) or in the `COREBOOT` FMAP regions. It is recommended for new builds using diff --git a/Documentation/mainboard/index.md b/Documentation/mainboard/index.md index 3426395dfb..e80ff0b512 100644 --- a/Documentation/mainboard/index.md +++ b/Documentation/mainboard/index.md @@ -74,7 +74,7 @@ The boards in this section are not real mainboards, but emulators. - [R60](lenovo/r60.md) - [T4xx common](lenovo/t4xx_series.md) - [X2xx common](lenovo/x2xx_series.md) -- [VBOOT](lenovo/vboot.md) +- [vboot](lenovo/vboot.md) ### Arrandale series diff --git a/Documentation/mainboard/lenovo/vboot.md b/Documentation/mainboard/lenovo/vboot.md index 3e4d43bd14..4e1b946d08 100644 --- a/Documentation/mainboard/lenovo/vboot.md +++ b/Documentation/mainboard/lenovo/vboot.md @@ -3,18 +3,18 @@ By default a single instance of coreboot is present in the firmware flash, no verification is done and the flash is not write-protected, so as to allow firmware updates from the OS. -The verified boot mechanism also called [VBOOT] allows secure firmware +The verified boot mechanism also called [vboot] allows secure firmware updates using an A/B partitioning scheme once enabled. -## Enabling VBOOT -You can enable [VBOOT] in Kconfig's *Security* section. Besides a verified +## 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 present on all recent Lenovo devices. ## Updating and recovery As the A/B partition is writeable you can still update them from the OS. -By using the [VBOOT] mechanism you store a copy of coreboot in the `RO` +By using the [vboot] mechanism you store a copy of coreboot in the `RO` partition that acts as failsafe in case the regular firmware update, that goes to the `A` or `B` partition fails. @@ -32,8 +32,8 @@ default FMAP. They are missing the `B` partition, due to size constaints. You can still provide your own FMAP if you need `RO`+`A`+`B` partitions. ## CMOS -[VBOOT] on *Lenovo* devices uses the CMOS to store configuration data, like +[vboot] on *Lenovo* devices uses the CMOS to store configuration data, like boot failures and the last successfully booted partition. -[VBOOT]: ../../security/vboot/index.md [CB:32705]: https://review.coreboot.org/32705 +[vboot]: ../../security/vboot/index.md diff --git a/Documentation/releases/coreboot-4.11-relnotes.md b/Documentation/releases/coreboot-4.11-relnotes.md index 890c2d7c36..f26de27104 100644 --- a/Documentation/releases/coreboot-4.11-relnotes.md +++ b/Documentation/releases/coreboot-4.11-relnotes.md @@ -175,7 +175,7 @@ of becoming more generally useful. Payload integration has been updated, coreinfo learned to cope with UPPER CASE commands and libpayload knows how to deal with USB3 hubs. -### Added VBOOT support to the following platforms: +### Added vboot support to the following platforms: * intel/gm45 * intel/nehalem diff --git a/Documentation/releases/coreboot-4.5-relnotes.md b/Documentation/releases/coreboot-4.5-relnotes.md index 8b649991a1..12230b298b 100644 --- a/Documentation/releases/coreboot-4.5-relnotes.md +++ b/Documentation/releases/coreboot-4.5-relnotes.md @@ -73,7 +73,7 @@ Areas with significant updates ### Vendorcode * AMD (14 commits) - Cleanup, add libagesa.a builds, remove unused code. -* Google (22 commits) - VBoot2 updates and cleanup +* Google (22 commits) - vboot2 updates and cleanup * Intel (86 commits) - Add Intel FSP 2.0, update Broadwell DE support ### Payloads (37 commits) diff --git a/Documentation/releases/coreboot-4.6-relnotes.md b/Documentation/releases/coreboot-4.6-relnotes.md index 4d19ba7fcf..6151b2c3fd 100644 --- a/Documentation/releases/coreboot-4.6-relnotes.md +++ b/Documentation/releases/coreboot-4.6-relnotes.md @@ -180,7 +180,7 @@ SuperIO (12 commits) * Add 2 new chips * Consolidate code to use common routines -Vboot (23 commits) +vboot (23 commits) * Add support for recovery hash space in TPM RISC-V (25 commits) diff --git a/Documentation/releases/coreboot-4.8.1-relnotes.md b/Documentation/releases/coreboot-4.8.1-relnotes.md index e2462365ac..14f1068a34 100644 --- a/Documentation/releases/coreboot-4.8.1-relnotes.md +++ b/Documentation/releases/coreboot-4.8.1-relnotes.md @@ -77,7 +77,7 @@ Security -------- * Start of refactoring the TPM software stack * Introduced coreboot security section in kconfig -* VBoot & TPM code moved into src/security +* vboot & TPM code moved into src/security Intelmetool ----------- diff --git a/Documentation/security/vboot/index.md b/Documentation/security/vboot/index.md index ff2261a669..faa8cb8561 100644 --- a/Documentation/security/vboot/index.md +++ b/Documentation/security/vboot/index.md @@ -196,7 +196,7 @@ not into the read/write coreboot file systems in *FW_MAIN_A* and *FW_MAIN_B*. **VBOOT_ENABLE_CBFS_FALLBACK** Normally coreboot will use the active read/write coreboot file system for all -of it's file access when VBOOT is active and is not in recovery mode. +of it's file access when vboot is active and is not in recovery mode. When the `VBOOT_ENABLE_CBFS_FALLBACK` option is enabled the cbfs file system will first try to locate a file in the active read/write file system. If the file diff --git a/Documentation/security/vboot/list_vboot.md b/Documentation/security/vboot/list_vboot.md index 1bef8234be..6b41597f18 100644 --- a/Documentation/security/vboot/list_vboot.md +++ b/Documentation/security/vboot/list_vboot.md @@ -1,4 +1,4 @@ -# VBOOT enabled devices +# vboot-enabled devices ## Emulation - QEMU x86 i440fx/piix4 (aka qemu -M pc) diff --git a/Documentation/security/vboot/measured_boot.md b/Documentation/security/vboot/measured_boot.md index 45d66dd2d2..df4cc68008 100644 --- a/Documentation/security/vboot/measured_boot.md +++ b/Documentation/security/vboot/measured_boot.md @@ -120,12 +120,12 @@ PCR-7 are left empty. ### PCR-0 _Hash:_ SHA1 -_Description:_ Google VBoot GBB flags. +_Description:_ Google vboot GBB flags. ### PCR-1 _Hash:_ SHA1/SHA256 -_Description:_ Google VBoot GBB HWID. +_Description:_ Google vboot GBB HWID. ### PCR-2 _Hash:_ SHA1/SHA256 diff --git a/util/vboot_list/vboot_list.sh b/util/vboot_list/vboot_list.sh index f3e8975e96..8c6a1a17aa 100755 --- a/util/vboot_list/vboot_list.sh +++ b/util/vboot_list/vboot_list.sh @@ -52,4 +52,4 @@ do done } -(echo "# VBOOT enabled devices"; generate_vboot_list) > $OUTPUT_FILE +(echo "# vboot-enabled devices"; generate_vboot_list) > $OUTPUT_FILE |