summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWim Vervoorn <wvervoorn@eltan.com>2019-11-14 10:03:25 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-15 10:54:04 +0000
commitf4a304722aed79577e9b4d23b0f536db35f2d5dc (patch)
treeaeca7f43e6a8c8428b65e2dced7d400e615f510e /src
parente05dc17d4b25589d4677913692298eaf305f4247 (diff)
vendorcode/eltan/security: Cleanup prog_locate_hook
Cleanup of the prog_locate_hook routine so the actual coreboot flow is more clearly reflected in the code. Remove logging that is not really needed. BUG=N/A TEST=tested on fbg1701 Change-Id: Iab6c75beac35d043d296336021c0bce1f828cf34 Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36846 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/vendorcode/eltan/security/verified_boot/vboot_check.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.c b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
index 36090ecd43..0633042539 100644
--- a/src/vendorcode/eltan/security/verified_boot/vboot_check.c
+++ b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
@@ -330,28 +330,25 @@ int verified_boot_should_run_oprom(struct rom_header *rom_header)
int prog_locate_hook(struct prog *prog)
{
- if (ENV_BOOTBLOCK) {
- printk(BIOS_SPEW, "%s: bootblock\n", __func__);
+ if (ENV_BOOTBLOCK)
verified_boot_bootblock_check();
- }
if (ENV_ROMSTAGE) {
- static int prepare_romstage = 0;
- printk(BIOS_SPEW, "%s: romstage\n", __func__);
- if (!prepare_romstage) {
+ if (prog->type == PROG_REFCODE)
verified_boot_early_check();
- prepare_romstage = 1;
- }
- }
- if (ENV_POSTCAR) {
- printk(BIOS_SPEW, "%s: postcar\n", __func__);
- process_verify_list(postcar_verify_list);
+ if (CONFIG(POSTCAR_STAGE) && prog->type == PROG_POSTCAR)
+ process_verify_list(postcar_verify_list);
+
+ if (!CONFIG(POSTCAR_STAGE) && prog->type == PROG_RAMSTAGE)
+ process_verify_list(ramstage_verify_list);
}
- if (ENV_RAMSTAGE) {
- printk(BIOS_SPEW, "%s: ramstage\n", __func__);
+ if (ENV_POSTCAR && prog->type == PROG_RAMSTAGE)
+ process_verify_list(ramstage_verify_list);
+
+ if (ENV_RAMSTAGE && prog->type == PROG_PAYLOAD)
process_verify_list(payload_verify_list);
- }
+
return 0;
}