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>
This commit is contained in:
parent
17200ad5fb
commit
c6100e5421
|
@ -26,7 +26,6 @@
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include <reset.h>
|
#include <reset.h>
|
||||||
#include <program_loading.h>
|
#include <program_loading.h>
|
||||||
#include <romstage_handoff.h>
|
|
||||||
#include <soc/addressmap.h>
|
#include <soc/addressmap.h>
|
||||||
#include <soc/cache.h>
|
#include <soc/cache.h>
|
||||||
#include <soc/clk_rst.h>
|
#include <soc/clk_rst.h>
|
||||||
|
@ -39,7 +38,6 @@
|
||||||
#include <soc/sdram.h>
|
#include <soc/sdram.h>
|
||||||
#include <symbols.h>
|
#include <symbols.h>
|
||||||
#include <timestamp.h>
|
#include <timestamp.h>
|
||||||
#include <vendorcode/google/chromeos/chromeos.h>
|
|
||||||
|
|
||||||
#include "sdram_configs.h"
|
#include "sdram_configs.h"
|
||||||
|
|
||||||
|
@ -92,8 +90,6 @@ static void __attribute__((noinline)) romstage(void)
|
||||||
|
|
||||||
early_mainboard_init();
|
early_mainboard_init();
|
||||||
|
|
||||||
vboot_verify_firmware(romstage_handoff_find_or_add());
|
|
||||||
|
|
||||||
run_ramstage();
|
run_ramstage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include <reset.h>
|
#include <reset.h>
|
||||||
#include <program_loading.h>
|
#include <program_loading.h>
|
||||||
#include <romstage_handoff.h>
|
|
||||||
#include <soc/addressmap.h>
|
#include <soc/addressmap.h>
|
||||||
#include <soc/cache.h>
|
#include <soc/cache.h>
|
||||||
#include <soc/clk_rst.h>
|
#include <soc/clk_rst.h>
|
||||||
|
@ -39,7 +38,6 @@
|
||||||
#include <soc/sdram.h>
|
#include <soc/sdram.h>
|
||||||
#include <symbols.h>
|
#include <symbols.h>
|
||||||
#include <timestamp.h>
|
#include <timestamp.h>
|
||||||
#include <vendorcode/google/chromeos/chromeos.h>
|
|
||||||
|
|
||||||
#include "sdram_configs.h"
|
#include "sdram_configs.h"
|
||||||
|
|
||||||
|
@ -92,8 +90,6 @@ static void __attribute__((noinline)) romstage(void)
|
||||||
|
|
||||||
early_mainboard_init();
|
early_mainboard_init();
|
||||||
|
|
||||||
vboot_verify_firmware(romstage_handoff_find_or_add());
|
|
||||||
|
|
||||||
run_ramstage();
|
run_ramstage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include <reset.h>
|
#include <reset.h>
|
||||||
#include <program_loading.h>
|
#include <program_loading.h>
|
||||||
#include <romstage_handoff.h>
|
|
||||||
#include <soc/addressmap.h>
|
#include <soc/addressmap.h>
|
||||||
#include <soc/cache.h>
|
#include <soc/cache.h>
|
||||||
#include <soc/clk_rst.h>
|
#include <soc/clk_rst.h>
|
||||||
|
|
|
@ -66,7 +66,6 @@ struct romstage_handoff;
|
||||||
/* Returns 0 on success < 0 on error. */
|
/* Returns 0 on success < 0 on error. */
|
||||||
int vboot_get_handoff_info(void **addr, uint32_t *size);
|
int vboot_get_handoff_info(void **addr, uint32_t *size);
|
||||||
#else /* CONFIG_VBOOT_VERIFY_FIRMWARE */
|
#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)
|
static inline int vboot_get_handoff_info(void **addr, uint32_t *size)
|
||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in New Issue