summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-11-28 15:04:35 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-24 10:23:32 +0100
commitccdd6eaecb6c11efa884ac14336f8e9b84d6dded (patch)
treeb9683ae4eabae452a45ca342b99b3a8efdf9c84b
parent5b37bd3afdae436b8c1490e19a436a11e652e1cf (diff)
downloadu-boot-imx-ccdd6eaecb6c11efa884ac14336f8e9b84d6dded.zip
u-boot-imx-ccdd6eaecb6c11efa884ac14336f8e9b84d6dded.tar.gz
u-boot-imx-ccdd6eaecb6c11efa884ac14336f8e9b84d6dded.tar.bz2
tegra: Move cpu_init_cp15() to arch_cpu_init()
This call is more of an architecture requirement than a board one, so move it there. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
-rw-r--r--arch/arm/cpu/armv7/tegra2/board.c4
-rw-r--r--board/nvidia/common/board.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c
index 59dce8f..d0a599e 100644
--- a/arch/arm/cpu/armv7/tegra2/board.c
+++ b/arch/arm/cpu/armv7/tegra2/board.c
@@ -80,6 +80,10 @@ int arch_cpu_init(void)
{
/* Fire up the Cortex A9 */
tegra2_start();
+
+ /* We didn't do this init in start.S, so do it now */
+ cpu_init_cp15();
+
return 0;
}
#endif
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index c3f6796..219b26a 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -143,9 +143,6 @@ int board_early_init_f(void)
uart_ids |= UARTD;
#endif
- /* We didn't do this init in start.S, so do it now */
- cpu_init_cp15();
-
/* Initialize essential common plls */
clock_early_init();