Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3609
-gerrit
commit 008c2d8bb379967fd972e0ba1fa63b07bd0404c5 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Wed Jun 19 10:41:18 2013 +0300
Fix CBMEM console use with CAR_MIGRATION
With EARLY_CBMEM_INIT and CAR_MIGRATION selected, cbmemc_reinit() was called twice during romstage. This effectively deleted output of romstage in CBMEM console.
Change-Id: I21072a319c0e4a5f695b0573bc017bf7921fc663 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/lib/cbmem_console.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index efb8e86..84aa144 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -193,7 +193,7 @@ static void copy_console_buffer(struct cbmem_console *new_cons_p) new_cons_p->buffer_cursor = cursor; }
-void cbmemc_reinit(void) +static void cbmemc_reinit_(void) { struct cbmem_console *cbm_cons_p;
@@ -221,5 +221,12 @@ void cbmemc_reinit(void) current_console_set(cbm_cons_p); }
-/* Call cbmemc_reinit() at CAR migration time. */ -CAR_MIGRATE(cbmemc_reinit) +void cbmemc_reinit(void) +{ +#if !CONFIG_CAR_MIGRATION || !defined(__PRE_RAM__) + cbmemc_reinit_(); +#endif +} + +/* Call cbmemc_reinit_() at CAR migration time. */ +CAR_MIGRATE(cbmemc_reinit_)