From 6e643d3425ee226b3ebfbf329b35e7017f83d0c3 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Tue, 13 May 2014 17:11:30 -0700 Subject: [PATCH] storm: enable early console Include the required modules in romstage and enable early console. BUG=chrome-os-partner:27784 TEST=observe the romstage prompt in the console output: coreboot-4.0 romstage Tue May 13 17:08:58 PDT 2014 starting... Change-Id: Ie3853b9afc53246e6eb997f279ccd4dbb08f748b Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/199673 Reviewed-by: Aaron Durbin --- src/mainboard/google/storm/Makefile.inc | 1 + src/mainboard/google/storm/romstage.c | 2 ++ src/soc/qualcomm/ipq806x/Kconfig | 1 + 3 files changed, 4 insertions(+) diff --git a/src/mainboard/google/storm/Makefile.inc b/src/mainboard/google/storm/Makefile.inc index e55646adb3..8d4d55e922 100644 --- a/src/mainboard/google/storm/Makefile.inc +++ b/src/mainboard/google/storm/Makefile.inc @@ -21,6 +21,7 @@ bootblock-y += bootblock.c bootblock-y += cdp.c romstage-y += romstage.c +romstage-y += cdp.c ramstage-y += mainboard.c ramstage-y += cdp.c diff --git a/src/mainboard/google/storm/romstage.c b/src/mainboard/google/storm/romstage.c index 856718cf19..d9a15bfa08 100644 --- a/src/mainboard/google/storm/romstage.c +++ b/src/mainboard/google/storm/romstage.c @@ -25,6 +25,8 @@ void main(void) { void *entry; + console_init(); + entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage"); stage_exit(entry); } diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 7c9f34d79b..c1db4f89af 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -6,6 +6,7 @@ config SOC_QC_IPQ806X select ARCH_ROMSTAGE_ARM_V7 select BOOTBLOCK_CONSOLE select DYNAMIC_CBMEM + select EARLY_CONSOLE select HAVE_UART_MEMORY_MAPPED select HAVE_UART_SPECIAL select SPI_ATOMIC_SEQUENCING