[coreboot-gerrit] Patch set updated for coreboot: f2cbec8 nyan*: cbmem: Move the call to cbmemc_reinit.

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7777

-gerrit

commit f2cbec80148595813a266b3a3a8b18cb0dc56cd2
Author: Gabe Black <gabeblack at google.com>
Date:   Mon Apr 21 19:51:15 2014 -0700

    nyan*: cbmem: Move the call to cbmemc_reinit.
    
    The call was after the call to vboot_verify_firmware and so would only be
    called when falling back to RO, aka recovery mode. This change moves it to
    before vboot_verify_firmware so we'll always have the cbmem console.
    
    BUG=None
    TEST=Built and booted on nyan and verified that the cbmem console was the same
    as the serial output. Built for big and blaze.
    BRANCH=nyan
    
    Original-Change-Id: I02d01110659689b08d32777dae384ac3e01b3b9f
    Original-Signed-off-by: Gabe Black <gabeblack at google.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/196158
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
    Original-Commit-Queue: Gabe Black <gabeblack at chromium.org>
    Original-Tested-by: Gabe Black <gabeblack at chromium.org>
    (cherry picked from commit d3e4a778e4a0f5ade7d633d8ce7e72ef06c44086)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: Id14a19a78bcb21cb0c4030c2e41195e491f690d5
---
 src/mainboard/google/nyan/romstage.c       | 7 ++++---
 src/mainboard/google/nyan_big/romstage.c   | 7 ++++---
 src/mainboard/google/nyan_blaze/romstage.c | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index 62cbd50..b4e2733 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -213,6 +213,10 @@ static void __attribute__((noinline)) romstage(void)
 	configure_ec_spi_bus();
 	configure_tpm_i2c_bus();
 
+#if CONFIG_CONSOLE_CBMEM
+	cbmemc_reinit();
+#endif
+
 	vboot_verify_firmware(romstage_handoff_find_or_add());
 
 	timestamp_add(TS_START_COPYRAM, timestamp_get());
@@ -220,9 +224,6 @@ static void __attribute__((noinline)) romstage(void)
 				      "fallback/coreboot_ram");
 	timestamp_add(TS_END_COPYRAM, timestamp_get());
 
-#if CONFIG_CONSOLE_CBMEM
-	cbmemc_reinit();
-#endif
 	stage_exit(entry);
 }
 
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index 62cbd50..b4e2733 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -213,6 +213,10 @@ static void __attribute__((noinline)) romstage(void)
 	configure_ec_spi_bus();
 	configure_tpm_i2c_bus();
 
+#if CONFIG_CONSOLE_CBMEM
+	cbmemc_reinit();
+#endif
+
 	vboot_verify_firmware(romstage_handoff_find_or_add());
 
 	timestamp_add(TS_START_COPYRAM, timestamp_get());
@@ -220,9 +224,6 @@ static void __attribute__((noinline)) romstage(void)
 				      "fallback/coreboot_ram");
 	timestamp_add(TS_END_COPYRAM, timestamp_get());
 
-#if CONFIG_CONSOLE_CBMEM
-	cbmemc_reinit();
-#endif
 	stage_exit(entry);
 }
 
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 62cbd50..b4e2733 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -213,6 +213,10 @@ static void __attribute__((noinline)) romstage(void)
 	configure_ec_spi_bus();
 	configure_tpm_i2c_bus();
 
+#if CONFIG_CONSOLE_CBMEM
+	cbmemc_reinit();
+#endif
+
 	vboot_verify_firmware(romstage_handoff_find_or_add());
 
 	timestamp_add(TS_START_COPYRAM, timestamp_get());
@@ -220,9 +224,6 @@ static void __attribute__((noinline)) romstage(void)
 				      "fallback/coreboot_ram");
 	timestamp_add(TS_END_COPYRAM, timestamp_get());
 
-#if CONFIG_CONSOLE_CBMEM
-	cbmemc_reinit();
-#endif
 	stage_exit(entry);
 }