[coreboot-gerrit] New patch to review for coreboot: 9299829 vboot: move Kconfig options for stage indicies
Aaron Durbin (adurbin@chromium.org)
gerrit at coreboot.org
Wed Apr 29 00:00:54 CEST 2015
Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10023
-gerrit
commit 92998295f77ecd470497c40cd58e3be258e0a9bb
Author: Aaron Durbin <adurbin at chromium.org>
Date: Tue Apr 28 16:02:17 2015 -0500
vboot: move Kconfig options for stage indicies
With vboot1 out of the way place all the associated Kconfig
options in vboot2's Kconfig file (excluding main vboot verify
option). More options will be added to accomodate vboot's various
combinations of use cases.
Change-Id: I17b06d741a36a5e2fefb2757651a61bfed61ae1e
Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
src/vendorcode/google/chromeos/Kconfig | 37 ---------------------------
src/vendorcode/google/chromeos/vboot2/Kconfig | 37 +++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index a75237e..90e3505 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -140,43 +140,6 @@ config VBOOT_VERIFY_FIRMWARE
Enabling VBOOT_VERIFY_FIRMWARE will use vboot to verify the components
of the firmware (stages, payload, etc).
-# These VBOOT_X_INDEX are the position of X in FW_MAIN_A/B region. The index
-# table is created by cros_bundle_firmware at build time based on the positions
-# of the blobs listed in fmap.dts and stored at the top of FW_MAIN_A/B region.
-# Unfortunately, there is no programmatical link between the blob list and the
-# index number here.
-config VBOOT_BOOT_LOADER_INDEX
- hex "Bootloader component index"
- default 0
- depends on VBOOT_VERIFY_FIRMWARE
- help
- This is the index of the bootloader component in the verified
- firmware block.
-
-config VBOOT_REFCODE_INDEX
- hex "Reference code firmware index"
- default 1
- depends on VBOOT_VERIFY_FIRMWARE
- help
- This is the index of the reference code component in the verified
- firmware block.
-
-config VBOOT_RAMSTAGE_INDEX
- hex "Ramstage component index"
- default 1
- depends on VBOOT_VERIFY_FIRMWARE
- help
- This is the index of the ramstage component in the verified
- firmware block.
-
-config VBOOT_ROMSTAGE_INDEX
- hex "Romstage component index"
- default 2
- depends on VBOOT_VERIFY_FIRMWARE
- help
- This is the index of the romstage component in the verified
- firmware block.
-
config NO_TPM_RESUME
bool
default n
diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig
index b27b5b7..3b5c594 100644
--- a/src/vendorcode/google/chromeos/vboot2/Kconfig
+++ b/src/vendorcode/google/chromeos/vboot2/Kconfig
@@ -55,3 +55,40 @@ config SEPARATE_VERSTAGE
bool
default !VERSTAGE_IN_BOOTBLOCK
depends on VBOOT_VERIFY_FIRMWARE
+
+# These VBOOT_X_INDEX are the position of X in FW_MAIN_A/B region. The index
+# table is created by cros_bundle_firmware at build time based on the positions
+# of the blobs listed in fmap.dts and stored at the top of FW_MAIN_A/B region.
+# Unfortunately, there is no programmatical link between the blob list and the
+# index number here.
+config VBOOT_ROMSTAGE_INDEX
+ hex "Romstage component index"
+ default 2
+ depends on VBOOT_VERIFY_FIRMWARE
+ help
+ This is the index of the romstage component in the verified
+ firmware block.
+
+config VBOOT_RAMSTAGE_INDEX
+ hex "Ramstage component index"
+ default 1
+ depends on VBOOT_VERIFY_FIRMWARE
+ help
+ This is the index of the ramstage component in the verified
+ firmware block.
+
+config VBOOT_REFCODE_INDEX
+ hex "Reference code firmware index"
+ default 1
+ depends on VBOOT_VERIFY_FIRMWARE
+ help
+ This is the index of the reference code component in the verified
+ firmware block.
+
+config VBOOT_BOOT_LOADER_INDEX
+ hex "Bootloader component index"
+ default 0
+ depends on VBOOT_VERIFY_FIRMWARE
+ help
+ This is the index of the bootloader component in the verified
+ firmware block.
More information about the coreboot-gerrit
mailing list