From 21a4053fde87801b42a0de39d5b6536c1ed4b475 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 21 Apr 2020 16:03:53 -0700 Subject: rules.h: Rename ENV_VERSTAGE to ENV_SEPARATE_VERSTAGE When CONFIG_SEPARATE_VERSTAGE=n, all verstage code gets linked into the appropriate calling stage (bootblock or romstage). This means that ENV_VERSTAGE is actually 0, and instead ENV_BOOTBLOCK or ENV_ROMSTAGE are 1. This keeps tripping up people who are just trying to write a simple "are we in verstage (i.e. wherever the vboot init logic runs)" check, e.g. for TPM init functions which may run in "verstage" or ramstage depending on whether vboot is enabled. Those checks will not work as intended for CONFIG_SEPARATE_VERSTAGE=n. This patch renames ENV_VERSTAGE to ENV_SEPARATE_VERSTAGE to try to clarify that this macro can really only be used to check whether code is running in a *separate* verstage, and clue people in that they may need to cover the linked-in verstage case as well. Signed-off-by: Julius Werner Change-Id: I2ff3a3c3513b3db44b3cff3d93398330cd3632ea Reviewed-on: https://review.coreboot.org/c/coreboot/+/40582 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/security/vboot/misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/security') diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h index fd422b2ff7..d1e60bb2ac 100644 --- a/src/security/vboot/misc.h +++ b/src/security/vboot/misc.h @@ -47,7 +47,7 @@ int vboot_locate_firmware(struct vb2_context *ctx, struct region_device *fw); static inline int verification_should_run(void) { if (CONFIG(VBOOT_SEPARATE_VERSTAGE)) - return ENV_VERSTAGE; + return ENV_SEPARATE_VERSTAGE; else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE)) return ENV_ROMSTAGE; else if (CONFIG(VBOOT_STARTS_IN_BOOTBLOCK)) -- cgit v1.2.3