diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-05-01 16:48:54 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-05-05 17:46:28 +0200 |
| commit | 0946a1bb21594d274fd21df7a9e40f3d90b0ba84 (patch) | |
| tree | d5c3dc9159b3c3cba46e10e81468d265e36a41f0 /src/soc | |
| parent | c3b0e29b4396f1fbcc213bf2319c8ffd624bae1a (diff) | |
vboot: remove uses of vboot2_verify_firmware()
The vboot mechanism will be implemented within the program loader
subsystem to make it transparent to mainboards and chipsets.
Change-Id: Icd0bdcba06cdc30591f9b25068b3fa3a112e58fb
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10094
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/broadcom/cygnus/verstage.c | 12 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/bootblock.c | 3 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra124/verstage.c | 9 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra132/verstage.c | 8 |
4 files changed, 8 insertions, 24 deletions
diff --git a/src/soc/broadcom/cygnus/verstage.c b/src/soc/broadcom/cygnus/verstage.c index b5ec27ff73..6b166cb9a7 100644 --- a/src/soc/broadcom/cygnus/verstage.c +++ b/src/soc/broadcom/cygnus/verstage.c @@ -19,10 +19,8 @@ #include <arch/cache.h> #include <arch/exception.h> -#include <arch/hlt.h> -#include <arch/stages.h> #include <console/console.h> -#include <vendorcode/google/chromeos/chromeos.h> +#include <program_loading.h> void main(void) { @@ -30,11 +28,5 @@ void main(void) console_init(); exception_init(); - - entry = vboot2_verify_firmware(); - - if (entry != (void *)-1) - stage_exit(entry); - - hlt(); + run_romstage(); } diff --git a/src/soc/marvell/bg4cd/bootblock.c b/src/soc/marvell/bg4cd/bootblock.c index 4913a1c628..b4de9722bb 100644 --- a/src/soc/marvell/bg4cd/bootblock.c +++ b/src/soc/marvell/bg4cd/bootblock.c @@ -18,10 +18,11 @@ */ #include <console/console.h> +#include <program_loading.h> #include <vendorcode/google/chromeos/chromeos.h> void main(void) { console_init(); - vboot2_verify_firmware(); + run_romstage(); } diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c index 2d7a9530b6..6b259bfdfb 100644 --- a/src/soc/nvidia/tegra124/verstage.c +++ b/src/soc/nvidia/tegra124/verstage.c @@ -22,11 +22,11 @@ #include <arch/hlt.h> #include <arch/stages.h> #include <console/console.h> +#include <program_loading.h> #include <soc/cache.h> #include <soc/early_configs.h> #include <stdlib.h> #include <symbols.h> -#include <vendorcode/google/chromeos/chromeos.h> static void enable_cache(void) { @@ -51,14 +51,9 @@ static void soc_init(void) static void verstage(void) { - void *entry; - soc_init(); early_mainboard_init(); - - entry = vboot2_verify_firmware(); - if (entry != (void *)-1) - stage_exit(entry); + run_romstage(); } void main(void) diff --git a/src/soc/nvidia/tegra132/verstage.c b/src/soc/nvidia/tegra132/verstage.c index e629eedc27..baf7fb7eb5 100644 --- a/src/soc/nvidia/tegra132/verstage.c +++ b/src/soc/nvidia/tegra132/verstage.c @@ -23,7 +23,7 @@ #include <arch/stages.h> #include <console/console.h> #include <soc/verstage.h> -#include <vendorcode/google/chromeos/chromeos.h> +#include <program_loading.h> void __attribute__((weak)) verstage_mainboard_init(void) { @@ -32,15 +32,11 @@ void __attribute__((weak)) verstage_mainboard_init(void) static void verstage(void) { - void *entry; - console_init(); exception_init(); verstage_mainboard_init(); - entry = vboot2_verify_firmware(); - if (entry != (void *)-1) - stage_exit(entry); + run_romstage(); } void main(void) |