From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 20 Feb 2014 08:48:08 +0000 (+0100)
Subject: ARM: zynq: Do not call fpga init when FPGA is disabled in SPL
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c223eaa214e723d4fe8b83ca86d00f6c6b4f0d7b;p=thirdparty%2Fu-boot.git

ARM: zynq: Do not call fpga init when FPGA is disabled in SPL

Fix logic around fpga initialization in SPL.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 5738ad32d99..3710bafebcf 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -59,7 +59,8 @@ int board_init(void)
 	 */
 	writel(0x26d, 0xe0001014);
 
-#ifdef CONFIG_FPGA
+#if (defined(CONFIG_FPGA) && !defined(CONFIG_SPL_BUILD)) || \
+    (defined(CONFIG_SPL_FPGA_SUPPORT) && defined(CONFIG_SPL_BUILD))
 	fpga_init();
 	fpga_add(fpga_xilinx, &fpga);
 #endif