diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c
index 59dce8f8de..d0a599edc5 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 c3f6796d5d..219b26aac4 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();