diff options
| author | Tom Rini <trini@ti.com> | 2014-05-13 07:34:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-13 07:34:08 -0400 |
| commit | 27b4e4b9913f65b52d20485dff3f8800bf78f3d7 (patch) | |
| tree | cfedde519b0ae53818787f67bc6b3818ae21d7fc /board/armadeus/apf27/fpga.c | |
| parent | e7d4a88e69459547a46906dbe021ccc83c614361 (diff) | |
| parent | 31081859855e606ca06131c3a14e099e043d39f0 (diff) | |
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
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 0c08c0640ef..65a4812c35b 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"} }; |