Change in coreboot[master]: google/butterfly: Replace use of #ifndef __PRE_RAM__

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

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

Change subject: google/butterfly: Replace use of #ifndef __PRE_RAM__
......................................................................

google/butterfly: Replace use of #ifndef __PRE_RAM__

Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/butterfly/chromeos.c
1 file changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/34926/1

diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 2825aae..1a1a2e1 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -71,13 +71,12 @@
    return 1;
 #endif

+	if (ENV_RAMSTAGE) {
+		if (ec_mem_read(EC_CODE_STATE) == EC_COS_EC_RO)
+			ec_rec_mode = 1;

-#ifndef __PRE_RAM__
-	if (ec_mem_read(EC_CODE_STATE) == EC_COS_EC_RO) {
-		ec_rec_mode = 1;
+		printk(BIOS_DEBUG,"RECOVERY MODE FROM EC: %x\n", ec_rec_mode);
    }
-	printk(BIOS_DEBUG,"RECOVERY MODE FROM EC: %x\n", ec_rec_mode);
-#endif

return ec_rec_mode;
 }

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34926 )

Change subject: google/butterfly: Replace use of #ifndef __PRE_RAM__
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34926/1/src/mainboard/google/butter... 
File src/mainboard/google/butterfly/chromeos.c:

https://review.coreboot.org/c/coreboot/+/34926/1/src/mainboard/google/butter... 
PS1, Line 78: 		printk(BIOS_DEBUG,"RECOVERY MODE FROM EC: %x\n", ec_rec_mode);
space required after that ',' (ctx:VxV)

Change in coreboot[master]: google/butterfly: Replace use of __PRE_RAM__

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

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34926

to look at the new patch set (#2).

Change subject: google/butterfly: Replace use of __PRE_RAM__
......................................................................

google/butterfly: Replace use of __PRE_RAM__

Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/butterfly/chromeos.c
1 file changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/34926/2

Change in coreboot[master]: google/butterfly: Replace use of __PRE_RAM__

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34926 )

Change subject: google/butterfly: Replace use of __PRE_RAM__
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34926/2/src/mainboard/google/butter... 
File src/mainboard/google/butterfly/chromeos.c:

https://review.coreboot.org/c/coreboot/+/34926/2/src/mainboard/google/butter... 
PS2, Line 78: 		printk(BIOS_DEBUG,"RECOVERY MODE FROM EC: %x\n", ec_rec_mode);
space required after that ',' (ctx:VxV)

Change in coreboot[master]: google/butterfly: Replace use of __PRE_RAM__

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

Hello Aaron Durbin, build bot (Jenkins), Furquan Shaikh,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34926

to look at the new patch set (#3).

Change subject: google/butterfly: Replace use of __PRE_RAM__
......................................................................

google/butterfly: Replace use of __PRE_RAM__

Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/butterfly/chromeos.c
1 file changed, 10 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/34926/3

Change in coreboot[master]: google/butterfly: Replace use of __PRE_RAM__

[Marshall Dawson (Code Review)]

Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34926 )

Change subject: google/butterfly: Replace use of __PRE_RAM__
......................................................................

Patch Set 3: Code-Review+2

Change in coreboot[master]: google/butterfly: Replace use of __PRE_RAM__

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

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34926 )

Change subject: google/butterfly: Replace use of __PRE_RAM__
......................................................................

google/butterfly: Replace use of __PRE_RAM__

Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34926
Tested-by: build bot (Jenkins) 
Reviewed-by: Marshall Dawson 
---
M src/mainboard/google/butterfly/chromeos.c
1 file changed, 10 insertions(+), 11 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marshall Dawson: Looks good to me, approved

diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index 2825aae..635aaee 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -66,18 +66,17 @@
 {
    int ec_rec_mode = 0;

-#if FORCE_RECOVERY_MODE
-	printk(BIOS_DEBUG,"FORCING RECOVERY MODE.\n");
-	return 1;
-#endif
-
-
-#ifndef __PRE_RAM__
-	if (ec_mem_read(EC_CODE_STATE) == EC_COS_EC_RO) {
-		ec_rec_mode = 1;
+	if (FORCE_RECOVERY_MODE) {
+		printk(BIOS_DEBUG, "FORCING RECOVERY MODE.\n");
+		return 1;
    }
-	printk(BIOS_DEBUG,"RECOVERY MODE FROM EC: %x\n", ec_rec_mode);
-#endif
+
+	if (ENV_RAMSTAGE) {
+		if (ec_mem_read(EC_CODE_STATE) == EC_COS_EC_RO)
+			ec_rec_mode = 1;
+
+		printk(BIOS_DEBUG, "RECOVERY MODE FROM EC: %x\n", ec_rec_mode);
+	}

return ec_rec_mode;
 }