ARM: zynq: Fix building SPL without FPGA support
authorMichal Simek <michal.simek@xilinx.com>
Tue, 4 Mar 2014 11:41:05 +0000 (12:41 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 14 May 2014 05:43:34 +0000 (07:43 +0200)
commit0b680206ccf5a4ae6adf759339ba7dc7ce06d284
treedc6cbbdd45adf7ac31e1b3faa880fba6b0c7abaf
parentdc4a1a2729f9ccaa473cf017c8bd4be4f242cafe
ARM: zynq: Fix building SPL without FPGA support

When CONFIG_FPGA is defined but CONFIG_SPL_FPGA is not, the build fails:
board.c: In function 'board_init':
board.c:41:3: error: 'fpga' undeclared (first use in this function)
   fpga = fpga010;

Fix this by expanding the "#if.." around this block to match the other
FPGA checks and don't compile this block when buildign for SPL without
FPGA support.

Tested a bootloader that had CONFIG_FPGA defined without CONFIG_SPL_FPGA,
this now compiles without errors and loading FPGA from u-boot works.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
board/xilinx/zynq/board.c