Paul Menzel (paulepanter@users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5352
-gerrit
commit 60438ccb7f0d0c55fd6ac161ce6d0989d7301e32 Author: Paul Menzel paulepanter@users.sourceforge.net Date: Sat Mar 8 12:39:30 2014 +0100
intel/cougar_canyon2/romstage.c: Remove `cbmemc_reinit`
Enabling CBMEM console for the Cougar Canyon 2 the build fails.
src/mainboard/intel/cougar_canyon2/romstage.c: In function 'romstage_main_continue': src/mainboard/intel/cougar_canyon2/romstage.c:345:2: error: implicit declaration of function 'cbmemc_reinit' [-Werror=implicit-function-declaration] cc1: all warnings being treated as errors
Since commit cbf5bdfe6 (CBMEM: Always select CAR_MIGRATION) [1] calling `cbmemc_reinit()` in the board’s romstage is not needed anymore, so remove it.
[1] http://review.coreboot.org/3916
Change-Id: I4dff2d11f073e2829ab3b081b5460f66eead4640 Signed-off-by: Paul Menzel paulepanter@users.sourceforge.net --- src/mainboard/intel/cougar_canyon2/romstage.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/src/mainboard/intel/cougar_canyon2/romstage.c b/src/mainboard/intel/cougar_canyon2/romstage.c index afd7e25..76a2689 100644 --- a/src/mainboard/intel/cougar_canyon2/romstage.c +++ b/src/mainboard/intel/cougar_canyon2/romstage.c @@ -340,10 +340,6 @@ void romstage_main_continue(EFI_STATUS status, VOID *HobListPtr) { timestamp_add(TS_AFTER_INITRAM, after_initram_time); timestamp_add_now(TS_END_ROMSTAGE); #endif -#if CONFIG_CONSOLE_CBMEM - /* Keep this the last thing this function does. */ - cbmemc_reinit(); -#endif
/* * FSP returns to this function instead of main, so we can't return back