Change in coreboot[master]: security/vboot: Replace use of __PRE_RAM__

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35387 )

Change subject: security/vboot: Replace use of __PRE_RAM__
......................................................................

security/vboot: Replace use of __PRE_RAM__

Change-Id: Ibaeda2762c733fdbe48979b635cc0cfd7ee4295d
Signed-off-by: Kyösti Mälkki 
---
M src/security/vboot/misc.h
1 file changed, 1 insertion(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/35387/1

diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index 725f5fd..1458354 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -117,11 +117,7 @@
    	return !ENV_BOOTBLOCK;
    } else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE)) {
    	/* Post-RAM stages are "after the romstage" */
-#ifdef __PRE_RAM__
-		return 0;
-#else
-		return 1;
-#endif
+		return !ENV_ROMSTAGE_OR_BEFORE;
    } else {
    	dead_code();
    }

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35387 )

Change subject: security/vboot: Replace use of __PRE_RAM__
......................................................................

Patch Set 1: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35387 )

Change subject: security/vboot: Replace use of __PRE_RAM__
......................................................................

Patch Set 2: Code-Review+2

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35387 )

Change subject: security/vboot: Replace use of __PRE_RAM__
......................................................................

security/vboot: Replace use of __PRE_RAM__

Change-Id: Ibaeda2762c733fdbe48979b635cc0cfd7ee4295d
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35387
Reviewed-by: Furquan Shaikh 
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
M src/security/vboot/misc.h
1 file changed, 1 insertion(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index 725f5fd..1458354 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -117,11 +117,7 @@
    	return !ENV_BOOTBLOCK;
    } else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE)) {
    	/* Post-RAM stages are "after the romstage" */
-#ifdef __PRE_RAM__
-		return 0;
-#else
-		return 1;
-#endif
+		return !ENV_ROMSTAGE_OR_BEFORE;
    } else {
    	dead_code();
    }

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35387 )

Change subject: security/vboot: Replace use of __PRE_RAM__
......................................................................

Patch Set 3:

I merged this already, but now came across this:

# When VBOOT_STARTS_IN_ROMSTAGE is selected, DRAM is already up by
  # the time verstage runs.
  ifneq ($(CONFIG_VBOOT_STARTS_IN_ROMSTAGE),y)
  verstage-generic-ccopts += -D__PRE_RAM__
  endif

We have early ChromeOS hardware with VBOOT_STARTS_IN_ROMSTAGE=y, I wonder if some of this got regressed with __PRE_RAM__ replacements? We should adjust ENV_ROMSTAGE_OR_AFTER in rules.h?

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35387 )

Change subject: security/vboot: Replace use of __PRE_RAM__
......................................................................

Patch Set 3:
> Patch Set 3:
>
> I merged this already, but now came across this:
>
> # When VBOOT_STARTS_IN_ROMSTAGE is selected, DRAM is already up by
>   # the time verstage runs.
>   ifneq ($(CONFIG_VBOOT_STARTS_IN_ROMSTAGE),y)
>   verstage-generic-ccopts += -D__PRE_RAM__
>   endif
>
> We have early ChromeOS hardware with VBOOT_STARTS_IN_ROMSTAGE=y, I wonder if some of this got regressed with __PRE_RAM__ replacements? We should adjust ENV_ROMSTAGE_OR_AFTER in rules.h?

CB:35408, let's discuss there instead.