From 588ad7b5db26a88dad36e2dbecf5a4242d8410be Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 29 Sep 2015 17:56:59 -0500 Subject: vboot: provide a unified flow for separate verstage The vboot verification in a stage proper is unified replacing duplicate code in the tegra SoC code. The original verstage.c file is renamed to reflect its real purpose. The support for a single verstage flow is added to the vboot2 directory proper. BUG=chrome-os-partner:44827 BRANCH=None TEST=Built glados. Change-Id: I14593e1fc69a1654fa27b512eb4b612395b94ce5 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11744 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/soc/nvidia/tegra210/include/soc/verstage.h | 2 +- src/soc/nvidia/tegra210/verstage.c | 45 -------------------------- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 src/soc/nvidia/tegra210/verstage.c (limited to 'src/soc/nvidia/tegra210') diff --git a/src/soc/nvidia/tegra210/include/soc/verstage.h b/src/soc/nvidia/tegra210/include/soc/verstage.h index 6c37218e9e..d6564c932a 100644 --- a/src/soc/nvidia/tegra210/include/soc/verstage.h +++ b/src/soc/nvidia/tegra210/include/soc/verstage.h @@ -20,6 +20,6 @@ #ifndef __SOC_NVIDIA_TEGRA210_SOC_VERSTAGE_H__ #define __SOC_NVIDIA_TEGRA210_SOC_VERSTAGE_H__ -void verstage_mainboard_init(void); +#include #endif /* __SOC_NVIDIA_TEGRA210_SOC_VERSTAGE_H__ */ diff --git a/src/soc/nvidia/tegra210/verstage.c b/src/soc/nvidia/tegra210/verstage.c deleted file mode 100644 index 6a4df29018..0000000000 --- a/src/soc/nvidia/tegra210/verstage.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc. - */ - -#include -#include -#include -#include -#include -#include - -void __attribute__((weak)) verstage_mainboard_init(void) -{ - /* Default empty implementation. */ -} - -static void verstage(void) -{ - console_init(); - exception_init(); - verstage_mainboard_init(); - - run_romstage(); -} - -void main(void) -{ - verstage(); - hlt(); -} -- cgit v1.2.3