diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c
index 7d1680f63d..24020e6c5c 100644
--- a/src/arch/arm/armv7/bootblock_simple.c
+++ b/src/arch/arm/armv7/bootblock_simple.c
@@ -26,6 +26,7 @@
 #include <bootblock_common.h>
 #include <cbfs.h>
 #include <console/console.h>
+#include <delay.h>
 
 void main(void)
 {
@@ -45,3 +46,8 @@ void main(void)
 	if (entry) stage_exit(entry);
 	hlt();
 }
+
+void bootblock_mainboard_init(void)
+{
+	init_timer();
+}
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 0b0182fceb..a781e30b50 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -17,11 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <device/device.h>
 #include <boot/coreboot_tables.h>
+#include <delay.h>
+#include <device/device.h>
 
 static void mainboard_init(device_t dev)
 {
+	init_timer();
 }
 
 static void mainboard_enable(device_t dev)
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index ef5d1d442b..61d19261d8 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/src/soc/qualcomm/ipq806x/Makefile.inc
@@ -1,10 +1,12 @@
 bootblock-y += cbfs.c
 bootblock-y += clock.c
 bootblock-y += gpio.c
+bootblock-y += timer.c
 
 romstage-y += cbfs.c
 romstage-y += clock.c
 romstage-y += gpio.c
+romstage-y += timer.c
 
 ramstage-y += cbfs.c
 ramstage-y += clock.c
diff --git a/src/soc/qualcomm/ipq806x/timer.c b/src/soc/qualcomm/ipq806x/timer.c
index 5c0dcb24bf..0d44e4a07d 100644
--- a/src/soc/qualcomm/ipq806x/timer.c
+++ b/src/soc/qualcomm/ipq806x/timer.c
@@ -40,7 +40,7 @@
 #define GPT_FREQ	(GPT_FREQ_KHZ * 1000)	/* 32 KHz */
 
 /**
- * timer_init - initialize timer
+ * init_timer - initialize timer
  */
 void init_timer(void)
 {