From c223eaa214e723d4fe8b83ca86d00f6c6b4f0d7b Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 20 Feb 2014 09:48:08 +0100 Subject: [PATCH] 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 --- board/xilinx/zynq/board.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.47.3