diff options
author | Randall Spangler <rspangler@chromium.org> | 2016-05-19 09:36:46 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2016-07-26 17:31:52 -0700 |
commit | 2afa87360d3a4c357e4bb2d37fdff9cdefbe0ffc (patch) | |
tree | 8193c20a76b641589387348d4e499f776531b08e /firmware/linktest | |
parent | c61df529d073ee2440d3b80c0a58a85a92d98e8f (diff) | |
download | vboot-2afa87360d3a4c357e4bb2d37fdff9cdefbe0ffc.tar.gz |
vboot: Remove vboot1 init and select-firmware APIs
And nuke all the underlying code that is unused once those APIs are
gone. These APIs are not used by any project in ToT, having been
superseded last year by the vboot2 APIs.
No functional changes to live code, just lots of deletes.
CQ-DEPEND=CL:347414
BUG=chromium:611535
BRANCH=none
TEST=make runtests; build samus
Change-Id: I05ac752d74d1343dd03600b1c5e6ed22822e2802
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/347257
Diffstat (limited to 'firmware/linktest')
-rw-r--r-- | firmware/linktest/main.c | 15 | ||||
-rw-r--r-- | firmware/linktest/main_vbinit.c | 15 | ||||
-rw-r--r-- | firmware/linktest/main_vbsf.c | 16 |
3 files changed, 0 insertions, 46 deletions
diff --git a/firmware/linktest/main.c b/firmware/linktest/main.c index aec180e1..fad11101 100644 --- a/firmware/linktest/main.c +++ b/firmware/linktest/main.c @@ -6,11 +6,9 @@ #include "sysincludes.h" #include "cgptlib.h" -#include "load_firmware_fw.h" #include "load_kernel_fw.h" #include "rollback_index.h" #include "tlcl.h" -#include "tpm_bootmode.h" #include "vboot_common.h" #include "vboot_kernel.h" #include "vboot_nvstorage.h" @@ -23,24 +21,14 @@ int main(void) GptNextKernelEntry(0, 0, 0); GptUpdateKernelEntry(0, 0); - /* load_firmware_fw.h */ - LoadFirmware(0, 0, 0); - /* load_kernel_fw.h */ LoadKernel(0, 0); /* rollback_index.h */ - RollbackS3Resume(); - RollbackFirmwareSetup(0, 0, 0, 0, 0); - RollbackFirmwareWrite(0); - RollbackFirmwareLock(); RollbackKernelRead(0); RollbackKernelWrite(0); RollbackKernelLock(0); - /* tpm_bootmode.c */ - SetTPMBootModeState(0, 0, 0, 0); - /* tlcl.h */ TlclStartup(); TlclResume(); @@ -66,9 +54,6 @@ int main(void) #endif /* vboot_api.h - entry points INTO vboot_reference */ - VbInit(0, 0); - VbSelectFirmware(0, 0); - VbUpdateFirmwareBodyHash(0, 0, 0); VbSelectAndLoadKernel(0, 0); /* vboot_common.h */ diff --git a/firmware/linktest/main_vbinit.c b/firmware/linktest/main_vbinit.c deleted file mode 100644 index 0300c915..00000000 --- a/firmware/linktest/main_vbinit.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "sysincludes.h" - -#include "vboot_api.h" - -int main(void) -{ - /* vboot_api.h - entry points INTO vboot_reference */ - VbInit(0, 0); - return 0; -} diff --git a/firmware/linktest/main_vbsf.c b/firmware/linktest/main_vbsf.c deleted file mode 100644 index db5c2660..00000000 --- a/firmware/linktest/main_vbsf.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "sysincludes.h" - -#include "vboot_api.h" - -int main(void) -{ - /* vboot_api.h - entry points INTO vboot_reference */ - VbSelectFirmware(0, 0); - VbUpdateFirmwareBodyHash(0, 0, 0); - return 0; -} |