[coreboot-gerrit] New patch to review for coreboot: e563924 ipq8064: make timer services available

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7869

-gerrit

commit e563924b83c87bed13170ed502fcc15e7a3afd9a
Author: Vadim Bendebury <vbendeb at chromium.org>
Date:   Wed Apr 23 11:09:44 2014 -0700

    ipq8064: make timer services available
    
    Make sure it is initialized at different stages.
    
    BUG=chrome-os-partner:27784
    TEST=manual
        . not much at this point, just verified that it compiles
    
    Original-Change-Id: I343e7a6648e2ca935606cd76befd204aabd93726
    Original-Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/196592
    (cherry picked from commit aedc41924313e5c21aef97b036f5a0643d59082d)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I2e10a8da1a5b2c081d1ec5011a1b979d2fed824d
---
 src/arch/arm/armv7/bootblock_simple.c  | 6 ++++++
 src/mainboard/google/storm/mainboard.c | 4 +++-
 src/soc/qualcomm/ipq806x/Makefile.inc  | 2 ++
 src/soc/qualcomm/ipq806x/timer.c       | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c
index aad63b6..7786fe2 100644
--- a/src/arch/arm/armv7/bootblock_simple.c
+++ b/src/arch/arm/armv7/bootblock_simple.c
@@ -27,6 +27,7 @@
 #include <console/console.h>
 #include <halt.h>
 #include <smp/node.h>
+#include <delay.h>
 
 void main(void)
 {
@@ -46,3 +47,8 @@ void main(void)
 	if (entry) stage_exit(entry);
 	halt();
 }
+
+void bootblock_mainboard_init(void)
+{
+	init_timer();
+}
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 0b0182f..a781e30 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 cffcc12..9d60108 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 5c0dcb2..0d44e4a 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)
 {