summaryrefslogtreecommitdiffstats
path: root/common/spl
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2012-08-23 08:34:21 +0200
committerStefan Roese <sr@denx.de>2012-12-05 17:30:22 +0100
commitea8256f072ccc04c83fa10030673cdd4cd01cbd9 (patch)
tree85d8f4dbeb70c33a9be4a6bfb7fd9cc259bde15d /common/spl
parent966b11c74909d2c1b38070dc4ab5708fba5be43d (diff)
downloadtalos-obmc-uboot-ea8256f072ccc04c83fa10030673cdd4cd01cbd9.tar.gz
talos-obmc-uboot-ea8256f072ccc04c83fa10030673cdd4cd01cbd9.zip
SPL: Port SPL framework to powerpc
This patch enables the SPL framework to be used on powerpc platforms and not only ARM. timer_init() does not exist on PPC systems. The timer (decrementer) is initialized and enabled in interrupt_init() here. And currently interrupt_init() is called after relocation to SDRAM. Since the only powerpc SPL implementation (a3m071) doesn't need a timer, let's remove this timer_init() call for PPC systems. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/spl.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index f068abd8f8..ff9ba7b0a5 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -74,6 +74,16 @@ __weak int spl_start_uboot(void)
}
#endif
+/*
+ * Weak default function for board specific cleanup/preparation before
+ * Linux boot. Some boards/platforms might not need it, so just provide
+ * an empty stub here.
+ */
+__weak void spl_board_prepare_for_linux(void)
+{
+ /* Nothing to do! */
+}
+
void spl_parse_image_header(const struct image_header *header)
{
u32 header_size = sizeof(struct image_header);
@@ -155,7 +165,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
CONFIG_SYS_SPL_MALLOC_SIZE);
#endif
+#ifndef CONFIG_PPC
+ /*
+ * timer_init() does not exist on PPC systems. The timer is initialized
+ * and enabled (decrementer) in interrupt_init() here.
+ */
timer_init();
+#endif
#ifdef CONFIG_SPL_BOARD_INIT
spl_board_init();
OpenPOWER on IntegriCloud