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