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 5738ad32d99a3e3f5b9c9da913970bea3c0c664e..3710bafebcf7589061c8a86c7777fbc1cb22b8f4 100644 (file)
--- 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