Merge branch 'master' of git://git.denx.de/u-boot-avr32

[u-boot] / arch / arm / mach-tegra / board2.c

diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index 131802ae62bcaafa90bd24cdfb6c1a3180aeeb06..ebcee4ed9a516529f1c04e79ea471316bf93f871 100644 (file)
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -107,6 +107,11 @@ __weak int tegra_lcd_pmic_init(int board_it)
        return 0;
 }
 
+__weak int nvidia_board_init(void)
+{
+       return 0;
+}
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -180,8 +185,7 @@ int board_init(void)
        /* prepare the WB code to LP0 location */
        warmboot_prepare_code(TEGRA_LP0_ADDR, TEGRA_LP0_SIZE);
 #endif
-
-       return 0;
+       return nvidia_board_init();
 }
 
 #ifdef CONFIG_BOARD_EARLY_INIT_F