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)
This commit is contained in:
Aaron Durbin 2015-05-01 16:48:54 -05:00 committed by Patrick Georgi
parent c3b0e29b43
commit 0946a1bb21
12 changed files with 8 additions and 73 deletions
src
mainboard/google
nyan_blaze
veyron_brain
veyron_danger
veyron_jerry
veyron_mighty
veyron_pinky
veyron_rialto
veyron_speedy
soc
broadcom/cygnus
marvell/bg4cd
nvidia
tegra124
tegra132

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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();
}

View File

@ -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)

View File

@ -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)