diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-05-08 16:10:10 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-05-11 22:39:31 +0200 |
| commit | c6100e54213c2abdf3e873c000f4cdce884e3f3d (patch) | |
| tree | 092c10233a7abe75a06332150f3908e684aed437 | |
| parent | 17200ad5fb6a6eb065ca108d308cd1a94268966e (diff) | |
chromeos: remove vboot_verify_firmware()
vboot_verify_firmware() was only defined to ease upstreaming.
It was only an empty inline as it is so remove it. Additionally,
vboot2 does not require romstage_handoff so there's no need in
adding it for the nyan boards.
Change-Id: I4d84ac9fb60c756cf10742f26503f7f11af5f57b
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/10155
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/mainboard/google/nyan/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/nyan_big/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/google/nyan_blaze/romstage.c | 1 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 1 |
4 files changed, 0 insertions, 10 deletions
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c index 83d2eeffea..1710815c38 100644 --- a/src/mainboard/google/nyan/romstage.c +++ b/src/mainboard/google/nyan/romstage.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <reset.h> #include <program_loading.h> -#include <romstage_handoff.h> #include <soc/addressmap.h> #include <soc/cache.h> #include <soc/clk_rst.h> @@ -39,7 +38,6 @@ #include <soc/sdram.h> #include <symbols.h> #include <timestamp.h> -#include <vendorcode/google/chromeos/chromeos.h> #include "sdram_configs.h" @@ -92,8 +90,6 @@ static void __attribute__((noinline)) romstage(void) early_mainboard_init(); - vboot_verify_firmware(romstage_handoff_find_or_add()); - run_ramstage(); } diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c index 83d2eeffea..1710815c38 100644 --- a/src/mainboard/google/nyan_big/romstage.c +++ b/src/mainboard/google/nyan_big/romstage.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <reset.h> #include <program_loading.h> -#include <romstage_handoff.h> #include <soc/addressmap.h> #include <soc/cache.h> #include <soc/clk_rst.h> @@ -39,7 +38,6 @@ #include <soc/sdram.h> #include <symbols.h> #include <timestamp.h> -#include <vendorcode/google/chromeos/chromeos.h> #include "sdram_configs.h" @@ -92,8 +90,6 @@ static void __attribute__((noinline)) romstage(void) early_mainboard_init(); - vboot_verify_firmware(romstage_handoff_find_or_add()); - run_ramstage(); } diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c index e56683d68d..ca7fb580a2 100644 --- a/src/mainboard/google/nyan_blaze/romstage.c +++ b/src/mainboard/google/nyan_blaze/romstage.c @@ -26,7 +26,6 @@ #include <console/console.h> #include <reset.h> #include <program_loading.h> -#include <romstage_handoff.h> #include <soc/addressmap.h> #include <soc/cache.h> #include <soc/clk_rst.h> diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 57ab640522..a87fbdff61 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -66,7 +66,6 @@ struct romstage_handoff; /* Returns 0 on success < 0 on error. */ int vboot_get_handoff_info(void **addr, uint32_t *size); #else /* CONFIG_VBOOT_VERIFY_FIRMWARE */ -static inline void vboot_verify_firmware(struct romstage_handoff *h) {} static inline int vboot_get_handoff_info(void **addr, uint32_t *size) { return -1; |