diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c index f8442d5d72..5528e376d3 100644 --- a/src/arch/x86/postcar_loader.c +++ b/src/arch/x86/postcar_loader.c @@ -99,8 +99,6 @@ static void load_postcar_cbfs(struct prog *prog, struct postcar_frame *pcf) .prog = prog, }; - vboot_run_logic(); - if (rmodule_stage_load(&rsl)) die_with_post_code(POSTCODE_INVALID_ROM, "Failed to load after CAR program.\n"); @@ -162,6 +160,8 @@ static void run_postcar_phase(struct postcar_frame *pcf) struct prog prog = PROG_INIT(PROG_POSTCAR, CONFIG_CBFS_PREFIX "/postcar"); + vboot_run_logic(); + if (resume_from_stage_cache()) { stage_cache_load_stage(STAGE_POSTCAR, &prog); /* This is here to allow platforms to pass different stack diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 17d946eac9..9e661c5956 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -92,6 +92,8 @@ void __noreturn run_ramstage(void) else timestamp_add_now(TS_ROMSTAGE_END); + vboot_run_logic(); + /* * Only x86 systems using ramstage stage cache currently take the same * firmware path on resume. @@ -99,8 +101,6 @@ void __noreturn run_ramstage(void) if (ENV_X86 && resume_from_stage_cache()) run_ramstage_from_resume(&ramstage); - vboot_run_logic(); - timestamp_add_now(TS_COPYRAM_START); if (ENV_X86) {