[coreboot-gerrit] Change in coreboot[master]: Chrome EC SOCs: Integrate Chrome EC check

[Paul Menzel (Code Review)]

Paul Menzel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42258 )

Change subject: Chrome EC SOCs: Integrate Chrome EC check
......................................................................

Chrome EC SOCs: Integrate Chrome EC check

Behave the same as newer platforms. Skylake has the same code.

This also adds brackets around &(gnvs->chromeos), so the it’s clear,
what pointer is meant.

Change-Id: I43ff551c717f598c7a65547ec49157853681314f
Signed-off-by: Paul Menzel 
---
M src/soc/amd/picasso/acpi.c
M src/soc/amd/stoneyridge/acpi.c
M src/soc/intel/apollolake/acpi.c
3 files changed, 21 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/42258/1

diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index fe5879c..7068ac0 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -254,8 +254,13 @@

if (CONFIG(CHROMEOS)) {
    	/* Initialize Verified Boot data */
-		chromeos_init_chromeos_acpi(&gnvs->chromeos);
-		gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
+		chromeos_init_chromeos_acpi(&(gnvs->chromeos));
+		if (CONFIG(EC_GOOGLE_CHROMEEC)) {
+			gnvs->chromeos.vbt2 = google_ec_running_ro() ?
+				ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
+		} else {
+			gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
+		}
    }

/* Set unknown wake source */
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index ea67aa3..54b5521 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -229,8 +229,13 @@

if (CONFIG(CHROMEOS)) {
    	/* Initialize Verified Boot data */
-		chromeos_init_chromeos_acpi(&gnvs->chromeos);
-		gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
+		chromeos_init_chromeos_acpi(&(gnvs->chromeos));
+		if (CONFIG(EC_GOOGLE_CHROMEEC)) {
+			gnvs->chromeos.vbt2 = google_ec_running_ro() ?
+				ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
+		} else {
+			gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
+		}
    }

/* Set unknown wake source */
diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index 595e6a2..f9962e9 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -83,8 +83,13 @@

if (CONFIG(CHROMEOS)) {
    	/* Initialize Verified Boot data */
-		chromeos_init_chromeos_acpi(&gnvs->chromeos);
-		gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
+		chromeos_init_chromeos_acpi(&(gnvs->chromeos));
+		if (CONFIG(EC_GOOGLE_CHROMEEC)) {
+			gnvs->chromeos.vbt2 = google_ec_running_ro() ?
+				ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
+		} else {
+			gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
+		}
    }

/* Set unknown wake source */