summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Vervoorn <wvervoorn@eltan.com>2019-11-14 09:50:59 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-15 10:53:13 +0000
commite05dc17d4b25589d4677913692298eaf305f4247 (patch)
tree3aeec5729fcab408c98e011b8a9e99a4d8b5ece7
parent7ea8b8866aed3551941d7f919bb8d6bb83ca5b30 (diff)
downloadcoreboot-e05dc17d4b25589d4677913692298eaf305f4247.tar.xz
vendorcode/eltan/security: Remove cbfs prepare and locate
The prepare functionality will be removed from cbfs support and the eltan verified boot is the only software using it. This is not really required as we can use the prog_locate_hook() for this functionality. BUG=N/A TEST=tested on fbg1701 Change-Id: I189cbad4b24bbbb0840ce6100c89a42a327c5456 Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36821 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
-rw-r--r--src/vendorcode/eltan/security/verified_boot/vboot_check.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.c b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
index c053263d61..36090ecd43 100644
--- a/src/vendorcode/eltan/security/verified_boot/vboot_check.c
+++ b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
@@ -328,7 +328,7 @@ int verified_boot_should_run_oprom(struct rom_header *rom_header)
return process_oprom_list(oprom_verify_list, rom_header);
}
-static void vendor_secure_prepare(void)
+int prog_locate_hook(struct prog *prog)
{
if (ENV_BOOTBLOCK) {
printk(BIOS_SPEW, "%s: bootblock\n", __func__);
@@ -353,10 +353,5 @@ static void vendor_secure_prepare(void)
printk(BIOS_SPEW, "%s: ramstage\n", __func__);
process_verify_list(payload_verify_list);
}
+ return 0;
}
-
-const struct cbfs_locator cbfs_default_locator = {
- .name = "Vendorcode Header Locator",
- .prepare = vendor_secure_prepare,
- .locate = cbfs_default_props
-};