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)

12 files changed, 8 insertions, 73 deletions

diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 12b2ffb36664..e56683d68d04 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 4156401cc072..0be99ced4bb9 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 9be13fe894b0..d1dfb84b9942 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 e8f54deedd18..0ff4585737e3 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 e8f54deedd18..0ff4585737e3 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 3e885647c752..742522e4fd78 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 9be13fe894b0..d1dfb84b9942 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 9be13fe894b0..d1dfb84b9942 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 b5ec27ff7301..6b166cb9a733 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 4913a1c628c0..b4de9722bbce 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 2d7a9530b606..6b259bfdfb38 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 e629eedc2742..baf7fb7eb57a 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)