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

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Kyösti Mälkki (Code Review)

17 Aug 2019 17 Aug '19

3:56 a.m.

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 kyosti.malkki@gmail.com --- 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; }

Attachments:

attachment.htm (text/html — 2.9 KB)

Show replies by date

build bot (Jenkins) (Code Review)

17 Aug 17 Aug

3:57 a.m.

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)

-- To view, visit https://review.coreboot.org/c/coreboot/+/34926 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9 Gerrit-Change-Number: 34926 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-CC: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Sat, 17 Aug 2019 03:57:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Kyösti Mälkki (Code Review)

2:37 p.m.

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

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__

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

build bot (Jenkins) (Code Review)

2:38 p.m.

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

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)

-- To view, visit https://review.coreboot.org/c/coreboot/+/34926 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9 Gerrit-Change-Number: 34926 Gerrit-PatchSet: 2 Gerrit-Owner: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Sat, 17 Aug 2019 14:38:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Kyösti Mälkki (Code Review)

19 Aug 19 Aug

12:21 a.m.

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

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__

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

-- To view, visit https://review.coreboot.org/c/coreboot/+/34926 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9 Gerrit-Change-Number: 34926 Gerrit-PatchSet: 3 Gerrit-Owner: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Marshall Dawson (Code Review)

20 Aug 20 Aug

1:11 a.m.

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

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

-- To view, visit https://review.coreboot.org/c/coreboot/+/34926 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9 Gerrit-Change-Number: 34926 Gerrit-PatchSet: 3 Gerrit-Owner: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: Marshall Dawson marshalldawson3rd@gmail.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Tue, 20 Aug 2019 01:11:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Kyösti Mälkki (Code Review)

1:16 a.m.

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

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 kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34926 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com --- 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; }

-- To view, visit https://review.coreboot.org/c/coreboot/+/34926 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iae944b589d587b30826e935feae029aa8d07d5d9 Gerrit-Change-Number: 34926 Gerrit-PatchSet: 4 Gerrit-Owner: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-Reviewer: Marshall Dawson marshalldawson3rd@gmail.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: merged

1863

days inactive

1866

days old

coreboot-gerrit@coreboot.org

6 comments

3 participants

tags (0)

participants (3)

build bot (Jenkins) (Code Review)
Kyösti Mälkki (Code Review)
Marshall Dawson (Code Review)