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 ------ 8 files changed, 49 deletions(-) (limited to 'src/mainboard/google') 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(); } -- cgit v1.2.3