[coreboot-gerrit] Patch set updated for coreboot: 5d57879 storm: Fix timer init order problem

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9574

-gerrit

commit 5d57879ad83b3d4f3d5f02c56692d7d4d97aaba5
Author: Julius Werner <jwerner at chromium.org>
Date:   Thu Dec 4 14:57:52 2014 -0800

    storm: Fix timer init order problem
    
    Commit 257aaee9e3a (arm: Add bootblock_mainboard_early_init() for
    pre-console initialization) inadvertently moved the timer initialization
    after console initialization for IPQ806x, which is apparently not a good
    idea for this platform. This patch solves the issue by moving
    init_timer() to bootblock_mainboard_early_init(), which is the new hook
    explicitly provided to perform pre-console tasks.
    
    BRANCH=None
    BUG=None
    TEST=Built and booted Storm with 257aaee9e reverted. Noticed that it was
    already broken. Bisected coreboot and tracked down breakage to commit
    a126a62f (ipq8064: use the new utility to build bootblock). Built and
    booted successfully with this patch and a revert of a126a62f to confirm
    that the bug in question here is fixed.
    
    Change-Id: I4a3faa2aec8ff1fbbe6c389f1d048475aa944418
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Commit-Id: 752d1f879f9bd841f18bd84842491f747458cf52
    Original-Change-Id: Ie4aa2d06cb6fda6d5ff8dd5ea052257fb7b8a24b
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/233290
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-by: Vadim Bendebury <vbendeb at chromium.org>
---
 src/mainboard/google/storm/Makefile.inc |  1 +
 src/mainboard/google/storm/bootblock.c  | 26 ++++++++++++++++++++++++++
 src/soc/qualcomm/ipq806x/Makefile.inc   |  1 -
 src/soc/qualcomm/ipq806x/bootblock.c    | 26 --------------------------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/mainboard/google/storm/Makefile.inc b/src/mainboard/google/storm/Makefile.inc
index 5add3b3..453caae 100644
--- a/src/mainboard/google/storm/Makefile.inc
+++ b/src/mainboard/google/storm/Makefile.inc
@@ -17,6 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
+bootblock-y += bootblock.c
 bootblock-y += cdp.c
 bootblock-y += reset.c
 
diff --git a/src/mainboard/google/storm/bootblock.c b/src/mainboard/google/storm/bootblock.c
new file mode 100644
index 0000000..fc9f8f3
--- /dev/null
+++ b/src/mainboard/google/storm/bootblock.c
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <bootblock_common.h>
+#include <delay.h>
+
+void bootblock_mainboard_early_init(void)
+{
+	init_timer();
+}
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index 5dfca4d..6d3f866 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/src/soc/qualcomm/ipq806x/Makefile.inc
@@ -17,7 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-bootblock-y += bootblock.c
 bootblock-y += clock.c
 bootblock-y += gpio.c
 bootblock-$(CONFIG_SPI_FLASH) += spi.c
diff --git a/src/soc/qualcomm/ipq806x/bootblock.c b/src/soc/qualcomm/ipq806x/bootblock.c
deleted file mode 100644
index a079d42..0000000
--- a/src/soc/qualcomm/ipq806x/bootblock.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <bootblock_common.h>
-#include <delay.h>
-
-void bootblock_soc_init(void)
-{
-	init_timer();
-}