diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-10-05 23:40:21 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-10-22 08:34:00 +0000 |
| commit | 4f32b64e4f88038347bec1d80ee2af41470d03ca (patch) | |
| tree | 77765fa2cd40095b72403f1927a48b2656106b07 /src/security/vboot | |
| parent | 076ce2f4d9082eb80a03f39111ad6e81fc2f8836 (diff) | |
reset: Provide new single-function reset API
board_reset() replaces the existing common reset API. There is no common
distinction between reset types across platforms, hence, common code
could never decide which one to call.
Currently only hard_reset() is used by common code. We replace these
calls and provide a fall-back to the current hard_reset() implemen-
tation. The fall-back will be removed along with hard_reset() after the
transition of all boards.
Change-Id: I274a8cee9cb38226b5a0bdff6a847c74ef0b3128
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/29047
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/security/vboot')
| -rw-r--r-- | src/security/vboot/Kconfig | 2 | ||||
| -rw-r--r-- | src/security/vboot/vboot_common.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index e13101b6be..af7578e630 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -18,7 +18,7 @@ config VBOOT bool "Verify firmware with vboot." default n select VBOOT_MOCK_SECDATA if !TPM1 && !TPM2 - depends on HAVE_HARD_RESET + depends on HAVE_HARD_RESET || !MISSING_BOARD_RESET help Enabling VBOOT will use vboot to verify the components of the firmware (stages, payload, etc). diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c index 901f126ca4..8b02da04c7 100644 --- a/src/security/vboot/vboot_common.c +++ b/src/security/vboot/vboot_common.c @@ -129,6 +129,5 @@ void vboot_reboot(void) if (IS_ENABLED(CONFIG_CONSOLE_CBMEM_DUMP_TO_UART)) cbmem_dump_console(); vboot_platform_prepare_reboot(); - hard_reset(); - die("failed to reboot"); + board_reset(); } |