diff options
| author | Marek Vasut <marex@denx.de> | 2014-05-15 00:20:54 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2014-05-15 00:20:54 +0200 |
| commit | 4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8 (patch) | |
| tree | ce2ac59e3f933e6c7f220edf3b14a2e46174ef14 /board/armadeus/apf27/fpga.c | |
| parent | fc25fa27e5f439705e9ca42182014e2d75d9f0ae (diff) | |
| parent | 2072e7262965bb48d7fffb1e283101e6ed8b21a8 (diff) | |
| download | u-boot-4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8.tar.gz u-boot-4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8.tar.xz u-boot-4180b3dba25c2c28cc4502f1c9f1cbad2a9972b8.zip | |
Merge remote-tracking branch 'u-boot/master' into test
Diffstat (limited to 'board/armadeus/apf27/fpga.c')
| -rw-r--r-- | board/armadeus/apf27/fpga.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c index 0c08c0640e..65a4812c35 100644 --- a/board/armadeus/apf27/fpga.c +++ b/board/armadeus/apf27/fpga.c @@ -26,7 +26,7 @@ * Spartan2 code is used to download our Spartan 3 :) code is compatible. * Just take care about the file size */ -Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = { +xilinx_spartan3_slave_parallel_fns fpga_fns = { fpga_pre_fn, fpga_pgm_fn, fpga_init_fn, @@ -42,12 +42,13 @@ Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = { fpga_post_fn, }; -Xilinx_desc fpga[CONFIG_FPGA_COUNT] = { - {Xilinx_Spartan3, +xilinx_desc fpga[CONFIG_FPGA_COUNT] = { + {xilinx_spartan3, slave_parallel, 1196128l/8, (void *)&fpga_fns, 0, + &spartan3_op, "3s200aft256"} }; |