summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Gagniuc <alexandrux.gagniuc@intel.com>2016-05-16 16:52:54 -0700
committerAaron Durbin <adurbin@chromium.org>2016-05-19 18:29:40 +0200
commit766ba779bda8628eddaf985daab604fa056a7e2a (patch)
treea71518260985b88bc4094ddb6abcb0b4f10ddbbc
parentf5babed62fa7e94fddd16940f5c476866b4c41be (diff)
soc/apollolake/romstage: Call console_init before any printk()
Follow the convention used on all other platforms and explicitly call console_init() before any printk(). This call was most likely ommitted by accident during rebase. Also remove the "Starting romstage..." message, as console_init() will print a standardized message. I don't have details on how this message originally appeared. Change-Id: Id91f0fc15ecbd3635d67a261907f4c6af9a499ab Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc@intel.com> Reviewed-on: https://review.coreboot.org/14864 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/soc/intel/apollolake/romstage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index cfef483d67..8c3a17077e 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -127,12 +127,12 @@ asmlinkage void car_stage_entry(void)
struct romstage_handoff *handoff;
struct chipset_power_state *ps = car_get_var_ptr(&power_state);
- printk(BIOS_DEBUG, "Starting romstage...\n");
soc_early_romstage_init();
-
disable_watchdog();
+ console_init();
+
prev_sleep_state = fill_power_state(ps);
/* Make sure the blob does not override our data in CAR */