From be34797e4c2a5b74bb8fcbbe9e4301b471d185e5 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 21 Apr 2015 11:57:18 -0500 Subject: ramstage: don't drop cbmem console In commit b0d8f5e9 I moved the call to cbmem_initialize() in the CONFIG_EARLY_CBMEM_INIT case to the very beginning of ramstage. However, that caused an issue in the ordering of the cbmem console driver in that it expects cbmemc_init() to be called prior to cbmemc_reinit(). Therefore, ensure console is called as the first thing even if some time is lost w.r.t. timestamp tracking. Change-Id: I42137d28116e0bccb9235f4e3f394d4fd8b84e37 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/9933 Tested-by: Raptor Engineering Automated Test Stand Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/lib/hardwaremain.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index 3d1b8f2a58..295edcdd69 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -434,6 +434,12 @@ static void boot_state_schedule_static_entries(void) void main(void) { + /* console_init() MUST PRECEDE ALL printk()! Additionally, ensure + * it is the very first thing done in ramstage.*/ + console_init(); + + post_code(POST_CONSOLE_READY); + /* * CBMEM needs to be recovered in the EARLY_CBMEM_INIT case because * timestamps, APCI, etc rely on the cbmem infrastructure being @@ -448,11 +454,6 @@ void main(void) timestamp_add_now(TS_START_RAMSTAGE); post_code(POST_ENTRY_RAMSTAGE); - /* console_init() MUST PRECEDE ALL printk()! */ - console_init(); - - post_code(POST_CONSOLE_READY); - /* Handoff sleep type from romstage. */ #if CONFIG_HAVE_ACPI_RESUME acpi_is_wakeup(); -- cgit v1.2.3