diff options
author | Aaron Durbin <adurbin@chromium.org> | 2015-04-22 10:41:42 -0500 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-28 16:09:56 +0200 |
commit | 1124cec59a2c705a4ef3740dbdf0f68113602d31 (patch) | |
tree | e5c519b0539e581c05c9d9f610a1a6deea9cd3a6 /src/vendorcode/google/chromeos/vboot2/Kconfig | |
parent | 6d65f796db04927bfc8324f50ad0816cec9673b6 (diff) | |
download | coreboot-staging-1124cec59a2c705a4ef3740dbdf0f68113602d31.zip coreboot-staging-1124cec59a2c705a4ef3740dbdf0f68113602d31.tar.gz |
chromeos: remove VBOOT2_VERIFY_FIRMWARE option
There's no need to have the VBOOT2_VERIFY_FIRMWARE
distinction because it's the only game in town.
Change-Id: I82aab665934c27829e1a04115bf499ae527a91aa
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9958
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/vendorcode/google/chromeos/vboot2/Kconfig')
-rw-r--r-- | src/vendorcode/google/chromeos/vboot2/Kconfig | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig index 0591006..b27b5b7 100644 --- a/src/vendorcode/google/chromeos/vboot2/Kconfig +++ b/src/vendorcode/google/chromeos/vboot2/Kconfig @@ -16,19 +16,10 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -config VBOOT2_VERIFY_FIRMWARE - bool "Firmware Verification with vboot2" - default y if VBOOT_VERIFY_FIRMARE - depends on CHROMEOS && HAVE_HARD_RESET - select COLLECT_TIMESTAMPS - help - Enabling VBOOT2_VERIFY_FIRMWARE will use vboot2 to verify the romstage - and boot loader. - config VBOOT2_MOCK_SECDATA bool "Mock secdata for firmware verification" default n - depends on VBOOT2_VERIFY_FIRMWARE + depends on VBOOT_VERIFY_FIRMWARE help Enabling VBOOT2_MOCK_SECDATA will mock secdata for the firmware verification to avoid access to a secdata storage (typically TPM). @@ -39,7 +30,7 @@ config VBOOT2_MOCK_SECDATA config RETURN_FROM_VERSTAGE bool "return from verstage" default n - depends on VBOOT2_VERIFY_FIRMWARE + depends on VBOOT_VERIFY_FIRMWARE help If this is set, the verstage returns back to the bootblock instead of exits to the romstage so that the verstage space can be reused by the @@ -49,7 +40,7 @@ config RETURN_FROM_VERSTAGE config VBOOT_DISABLE_DEV_ON_RECOVERY bool "Disable dev mode on recovery requests" default n - depends on VBOOT2_VERIFY_FIRMWARE + depends on VBOOT_VERIFY_FIRMWARE help When this option is enabled, the Chrome OS device leaves the developer mode as soon as recovery request is detected. This is @@ -58,9 +49,9 @@ config VBOOT_DISABLE_DEV_ON_RECOVERY config VERSTAGE_IN_BOOTBLOCK bool default n - depends on VBOOT2_VERIFY_FIRMWARE + depends on VBOOT_VERIFY_FIRMWARE config SEPARATE_VERSTAGE bool default !VERSTAGE_IN_BOOTBLOCK - depends on VBOOT2_VERIFY_FIRMWARE + depends on VBOOT_VERIFY_FIRMWARE |