diff options
Diffstat (limited to 'src/security/vboot/misc.h')
| -rw-r--r-- | src/security/vboot/misc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h index 8af0c827a8..470102111e 100644 --- a/src/security/vboot/misc.h +++ b/src/security/vboot/misc.h @@ -57,7 +57,7 @@ static inline int verification_should_run(void) static inline int verstage_should_load(void) { - if (CONFIG(VBOOT_SEPARATE_VERSTAGE)) + if (CONFIG(VBOOT_SEPARATE_VERSTAGE) && !CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) return ENV_BOOTBLOCK; else return 0; @@ -80,6 +80,8 @@ static inline int vboot_logic_executed(void) } else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE)) { /* Post-RAM stages are "after the romstage" */ return !ENV_ROMSTAGE_OR_BEFORE; + } else if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) { + return !ENV_SEPARATE_VERSTAGE; } else { dead_code(); } |