From 85620db107d587a8341987162d403f4b7aee9a81 Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Wed, 13 Nov 2013 18:22:15 -0800
Subject: arm: Move exception_init() close to console_init()

This patch adds stub implementations of exception_init() to all archs
so that it can be called from src/lib/hardwaremain.c. It also moves/adds
all other invocations of exception_init() (which needs to be rerun in
every stage) close to console_init(), in the hopes that it will be less
likely overlooked when creating future boards. Also added (an
ineffective) one to the armv4 bootblock implementations for consistency
and in case we want to implement it later.

Change-Id: Iecad10172d25f6c1fc54b0fec8165d7ef60e3414
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/176764
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Reviewed-by: David Hendricks <dhendrix@chromium.org>
(cherry picked from commit 2960623f4a59d841a13793ee906db8d1b1c16c5d)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6884
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
---
 src/mainboard/google/snow/mainboard.c | 5 -----
 src/mainboard/google/snow/romstage.c  | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/mainboard/google/snow')

diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c
index 99a4e30a79..0b6cf4ae83 100644
--- a/src/mainboard/google/snow/mainboard.c
+++ b/src/mainboard/google/snow/mainboard.c
@@ -27,7 +27,6 @@
 #include <vbe.h>
 #include <boot/coreboot_tables.h>
 #include <arch/cache.h>
-#include <arch/exception.h>
 #include <soc/samsung/exynos5250/tmu.h>
 #include <soc/samsung/exynos5250/clk.h>
 #include <soc/samsung/exynos5250/gpio.h>
@@ -338,10 +337,6 @@ static void mainboard_enable(device_t dev)
 	dcache_invalidate_all();
 	dcache_mmu_enable();
 
-	/* this is going to move, but we must have it now and we're
-	 * not sure where */
-	exception_init();
-
 	const unsigned epll_hz = 192000000;
 	const unsigned sample_rate = 48000;
 	const unsigned lr_frame_size = 256;
diff --git a/src/mainboard/google/snow/romstage.c b/src/mainboard/google/snow/romstage.c
index ac469ba41b..9b35c4a6d4 100644
--- a/src/mainboard/google/snow/romstage.c
+++ b/src/mainboard/google/snow/romstage.c
@@ -24,6 +24,7 @@
 #include <cbmem.h>
 
 #include <arch/cache.h>
+#include <arch/exception.h>
 #include <soc/samsung/exynos5250/i2c.h>
 #include <soc/samsung/exynos5250/clk.h>
 #include <soc/samsung/exynos5250/cpu.h>
@@ -151,6 +152,7 @@ void main(void)
 	mem = setup_clock();
 
 	console_init();
+	exception_init();
 
 	setup_power(is_resume);
 	setup_memory(mem, is_resume);
-- 
cgit v1.2.3