diff options
author | Aaron Durbin <adurbin@chromium.org> | 2015-09-29 17:56:59 -0500 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2015-09-30 06:58:02 +0000 |
commit | 588ad7b5db26a88dad36e2dbecf5a4242d8410be (patch) | |
tree | ab7edd6a55205ed2546b854fdaaab858498ace05 /src/soc/nvidia/tegra132 | |
parent | 1d85700503afdb8516ee945e9e294d4a6aa1c759 (diff) |
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 <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11744
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc/nvidia/tegra132')
-rw-r--r-- | src/soc/nvidia/tegra132/include/soc/verstage.h | 2 | ||||
-rw-r--r-- | src/soc/nvidia/tegra132/verstage.c | 48 |
2 files changed, 1 insertions, 49 deletions
diff --git a/src/soc/nvidia/tegra132/include/soc/verstage.h b/src/soc/nvidia/tegra132/include/soc/verstage.h index df6a386e15..d54a111942 100644 --- a/src/soc/nvidia/tegra132/include/soc/verstage.h +++ b/src/soc/nvidia/tegra132/include/soc/verstage.h @@ -20,6 +20,6 @@ #ifndef __SOC_NVIDIA_TEGRA132_SOC_VERSTAGE_H__ #define __SOC_NVIDIA_TEGRA132_SOC_VERSTAGE_H__ -void verstage_mainboard_init(void); +#include <vendorcode/google/chromeos/chromeos.h> #endif /* __SOC_NVIDIA_TEGRA132_SOC_VERSTAGE_H__ */ diff --git a/src/soc/nvidia/tegra132/verstage.c b/src/soc/nvidia/tegra132/verstage.c deleted file mode 100644 index d6eba9a8ef..0000000000 --- a/src/soc/nvidia/tegra132/verstage.c +++ /dev/null @@ -1,48 +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 <arch/cache.h> -#include <arch/exception.h> -#include <arch/hlt.h> -#include <arch/stages.h> -#include <console/console.h> -#include <soc/verstage.h> -#include <program_loading.h> -#include <timestamp.h> - -void __attribute__((weak)) verstage_mainboard_init(void) -{ - /* Default empty implementation. */ -} - -static void verstage(void) -{ - console_init(); - timestamp_add_now(TS_START_VBOOT); - exception_init(); - verstage_mainboard_init(); - - run_romstage(); -} - -void main(void) -{ - verstage(); - hlt(); -} |