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 ea7d4bfbdcae4e9a1fb4ad2cdfef5fc539ddca3c Author: Paul Menzel paulepanter@users.sourceforge.net Date: Sat Mar 8 12:39:30 2014 +0100
intel/cougar_canyon2/romstage.c: Remove unneeded `cbmemc_reinit`
Enabling CBMEM console for the Cougar Canyon 2 makes the build fail as there is no prototype for `cbmemc_reinit()`. The reason is that since commit
1d7541fe console: Fix includes
`console/cbmem_console.h` is not included anymore through `console/console.h`.
Since commit
cbf5bdfe6 CBMEM: Always select CAR_MIGRATION
calling `cbmemc_reinit()` in the board’s romstage is not needed anymore, so remove it.
According to Martin Roth, CBMEM console does not work on the board Cougar Canyon 2 as CAR_MIGRATION is not supported due to shortcomings of the currently used FSP version. Therefore this patch just addresses the compile failure, so CBMEM console can be enabled by default for all boards.
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