From: Michal Simek <monstr@monstr.eu>
Date: Fri, 25 Apr 2014 10:15:40 +0000 (+0200)
Subject: ARM: zynq: Call zynq board_init() in SPL
X-Git-Tag: v2014.07-rc2~2^2~2^2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1540fb725bb7067f5cacbcc624f8684ed1471815;p=oweals%2Fu-boot.git

ARM: zynq: Call zynq board_init() in SPL

Call board_init() if SPL is configured with CONFIG_SPL_BOARD_INIT.

Signed-off-by: Michal Simek <monstr@monstr.eu>
---

diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c
index fcad762c03..c3ea221549 100644
--- a/arch/arm/cpu/armv7/zynq/spl.c
+++ b/arch/arm/cpu/armv7/zynq/spl.c
@@ -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;
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 731e69b5fd..2080a612bb 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -235,6 +235,7 @@
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_BOARD_INIT
 
 #define CONFIG_SPL_LDSCRIPT	"arch/arm/cpu/armv7/zynq/u-boot-spl.lds"