diff options
| author | Julius Werner <jwerner@chromium.org> | 2014-12-04 14:57:52 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-13 17:37:01 +0200 |
| commit | 4913cb78d2e8a37e80128fbd82466d1825dba413 (patch) | |
| tree | c4478b97f6d8227fa75cb7884bf5b3df64816b34 | |
| parent | 0594914decf27fb600127f9541e756a2a2383d49 (diff) | |
| download | coreboot-4913cb78d2e8a37e80128fbd82466d1825dba413.tar.xz | |
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@chromium.org>
Original-Commit-Id: 752d1f879f9bd841f18bd84842491f747458cf52
Original-Change-Id: Ie4aa2d06cb6fda6d5ff8dd5ea052257fb7b8a24b
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/233290
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://review.coreboot.org/9574
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/mainboard/google/storm/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/google/storm/bootblock.c (renamed from src/soc/qualcomm/ipq806x/bootblock.c) | 2 | ||||
| -rw-r--r-- | src/soc/qualcomm/ipq806x/Makefile.inc | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/google/storm/Makefile.inc b/src/mainboard/google/storm/Makefile.inc index 5add3b3e56..453caae143 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/soc/qualcomm/ipq806x/bootblock.c b/src/mainboard/google/storm/bootblock.c index a079d42922..fc9f8f39dd 100644 --- a/src/soc/qualcomm/ipq806x/bootblock.c +++ b/src/mainboard/google/storm/bootblock.c @@ -20,7 +20,7 @@ #include <bootblock_common.h> #include <delay.h> -void bootblock_soc_init(void) +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 5dfca4d7ad..6d3f8665d1 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 |