From 0946a1bb21594d274fd21df7a9e40f3d90b0ba84 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 1 May 2015 16:48:54 -0500 Subject: 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 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/10094 Tested-by: build bot (Jenkins) --- src/mainboard/google/nyan_blaze/romstage.c | 7 ------- src/mainboard/google/veyron_brain/romstage.c | 6 ------ src/mainboard/google/veyron_danger/romstage.c | 6 ------ src/mainboard/google/veyron_jerry/romstage.c | 6 ------ src/mainboard/google/veyron_mighty/romstage.c | 6 ------ src/mainboard/google/veyron_pinky/romstage.c | 6 ------ src/mainboard/google/veyron_rialto/romstage.c | 6 ------ src/mainboard/google/veyron_speedy/romstage.c | 6 ------ src/soc/broadcom/cygnus/verstage.c | 12 ++---------- src/soc/marvell/bg4cd/bootblock.c | 3 ++- src/soc/nvidia/tegra124/verstage.c | 9 ++------- src/soc/nvidia/tegra132/verstage.c | 8 ++------ 12 files changed, 8 insertions(+), 73 deletions(-) (limited to 'src') diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c index 12b2ffb366..e56683d68d 100644 --- a/src/mainboard/google/nyan_blaze/romstage.c +++ b/src/mainboard/google/nyan_blaze/romstage.c @@ -95,13 +95,6 @@ static void __attribute__((noinline)) romstage(void) early_mainboard_init(); -#if CONFIG_VBOOT_VERIFY_FIRMWARE - entry = vboot2_load_ramstage(); -#else - early_mainboard_init(); - vboot_verify_firmware(romstage_handoff_find_or_add()); -#endif - run_ramstage(); } diff --git a/src/mainboard/google/veyron_brain/romstage.c b/src/mainboard/google/veyron_brain/romstage.c index 4156401cc0..0be99ced4b 100644 --- a/src/mainboard/google/veyron_brain/romstage.c +++ b/src/mainboard/google/veyron_brain/romstage.c @@ -117,11 +117,5 @@ void main(void) timestamp_add_now(TS_END_ROMSTAGE); #endif -#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot2_load_ramstage(); - if (entry != NULL) - stage_exit(entry); -#endif - run_ramstage(); } diff --git a/src/mainboard/google/veyron_danger/romstage.c b/src/mainboard/google/veyron_danger/romstage.c index 9be13fe894..d1dfb84b99 100644 --- a/src/mainboard/google/veyron_danger/romstage.c +++ b/src/mainboard/google/veyron_danger/romstage.c @@ -127,11 +127,5 @@ void main(void) timestamp_add_now(TS_END_ROMSTAGE); #endif -#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot2_load_ramstage(); - if (entry != NULL) - stage_exit(entry); -#endif - run_ramstage(); } diff --git a/src/mainboard/google/veyron_jerry/romstage.c b/src/mainboard/google/veyron_jerry/romstage.c index e8f54deedd..0ff4585737 100644 --- a/src/mainboard/google/veyron_jerry/romstage.c +++ b/src/mainboard/google/veyron_jerry/romstage.c @@ -126,11 +126,5 @@ void main(void) timestamp_add_now(TS_END_ROMSTAGE); #endif -#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot2_load_ramstage(); - if (entry != NULL) - stage_exit(entry); -#endif - run_ramstage(); } diff --git a/src/mainboard/google/veyron_mighty/romstage.c b/src/mainboard/google/veyron_mighty/romstage.c index e8f54deedd..0ff4585737 100644 --- a/src/mainboard/google/veyron_mighty/romstage.c +++ b/src/mainboard/google/veyron_mighty/romstage.c @@ -126,11 +126,5 @@ void main(void) timestamp_add_now(TS_END_ROMSTAGE); #endif -#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot2_load_ramstage(); - if (entry != NULL) - stage_exit(entry); -#endif - run_ramstage(); } diff --git a/src/mainboard/google/veyron_pinky/romstage.c b/src/mainboard/google/veyron_pinky/romstage.c index 3e885647c7..742522e4fd 100644 --- a/src/mainboard/google/veyron_pinky/romstage.c +++ b/src/mainboard/google/veyron_pinky/romstage.c @@ -134,11 +134,5 @@ void main(void) timestamp_add_now(TS_END_ROMSTAGE); #endif -#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot2_load_ramstage(); - if (entry != NULL) - stage_exit(entry); -#endif - run_ramstage(); } diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c index 9be13fe894..d1dfb84b99 100644 --- a/src/mainboard/google/veyron_rialto/romstage.c +++ b/src/mainboard/google/veyron_rialto/romstage.c @@ -127,11 +127,5 @@ void main(void) timestamp_add_now(TS_END_ROMSTAGE); #endif -#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot2_load_ramstage(); - if (entry != NULL) - stage_exit(entry); -#endif - run_ramstage(); } diff --git a/src/mainboard/google/veyron_speedy/romstage.c b/src/mainboard/google/veyron_speedy/romstage.c index 9be13fe894..d1dfb84b99 100644 --- a/src/mainboard/google/veyron_speedy/romstage.c +++ b/src/mainboard/google/veyron_speedy/romstage.c @@ -127,11 +127,5 @@ void main(void) timestamp_add_now(TS_END_ROMSTAGE); #endif -#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE) - void *entry = vboot2_load_ramstage(); - if (entry != NULL) - stage_exit(entry); -#endif - run_ramstage(); } 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 #include -#include -#include #include -#include +#include 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 +#include #include 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 #include #include +#include #include #include #include #include -#include 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 #include #include -#include +#include 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) -- cgit v1.2.3