summaryrefslogtreecommitdiff
path: root/src/vendorcode/google/chromeos
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-04-28 16:02:17 -0500
committerPatrick Georgi <pgeorgi@google.com>2015-04-30 13:05:20 +0200
commit5abcba71212bf162661b22aec7f8ad7141547668 (patch)
treef9b7ab154ec7e7bca9c1285cce4a705e1c14f057 /src/vendorcode/google/chromeos
parent5e8286bed6f18cd2a85b029911f97da21b38394d (diff)
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@chromium.org> Reviewed-on: http://review.coreboot.org/10023 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/vendorcode/google/chromeos')
-rw-r--r--src/vendorcode/google/chromeos/Kconfig37
-rw-r--r--src/vendorcode/google/chromeos/vboot2/Kconfig37
2 files changed, 37 insertions, 37 deletions
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index a75237e488..90e3505260 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 b27b5b76f4..3b5c594237 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.