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

[oweals/u-boot.git] / arch / arm / cpu / armv7 / zynq / spl.c

diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c
index fcad762c030644d3d004cebbbdba9670a9b638a4..9ff2ef2ae36023cab39846a8fe2b1b07e0195735 100644 (file)
--- a/arch/arm/cpu/armv7/zynq/spl.c
+++ b/arch/arm/cpu/armv7/zynq/spl.c
@@ -8,7 +8,7 @@
 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/spl.h>
+#include <asm/spl.h>
 #include <asm/arch/sys_proto.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -28,6 +28,13 @@ void board_init_f(ulong dummy)
        board_init_r(NULL, 0);
 }
 
+#ifdef CONFIG_SPL_BOARD_INIT
+void spl_board_init(void)
+{
+       board_init();
+}
+#endif
+
 u32 spl_boot_device(void)
 {
        u32 mode;
@@ -67,3 +74,11 @@ int spl_start_uboot(void)
        return 0;
 }
 #endif
+
+__weak void ps7_init(void)
+{
+       /*
+        * This function is overridden by the one in
+        * board/xilinx/zynq/ps7_init.c, if it exists.
+        */
+}