[U-Boot] [PATCH v2 1/7] tegra: Move cpu_init_cp15() to arch_cpu_init()

Simon Glass sjg at chromium.org
Tue Nov 29 02:04:35 CET 2011


This call is more of an architecture requirement than a board
one, so move it there.

Signed-off-by: Simon Glass <sjg at chromium.org>
Acked-by: Stephen Warren <swarren at nvidia.com>
---
Changes in v2:
- Code style: added blank line before return in arch_cpu_init()

 arch/arm/cpu/armv7/tegra2/board.c |    4 ++++
 board/nvidia/common/board.c       |    3 ---
 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 f39fb24..219b26a 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -133,9 +133,6 @@ int board_early_init_f(void)
 {
 	int uart_ids = 0;	/* bit mask of which UART ids to enable */
 
-	/* We didn't do this init in start.S, so do it now */
-	cpu_init_cp15();
-
 #ifdef CONFIG_TEGRA2_ENABLE_UARTA
 	uart_ids |= UARTA;
 #endif
-- 
1.7.3.1



More information about the U-Boot mailing list