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/matrix_vision/mvsmr/fpga.c | |
| parent | fc25fa27e5f439705e9ca42182014e2d75d9f0ae (diff) | |
| parent | 2072e7262965bb48d7fffb1e283101e6ed8b21a8 (diff) | |
Merge remote-tracking branch 'u-boot/master' into test
Diffstat (limited to 'board/matrix_vision/mvsmr/fpga.c')
| -rw-r--r-- | board/matrix_vision/mvsmr/fpga.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/matrix_vision/mvsmr/fpga.c b/board/matrix_vision/mvsmr/fpga.c index 88035a9e9e3..518992578c1 100644 --- a/board/matrix_vision/mvsmr/fpga.c +++ b/board/matrix_vision/mvsmr/fpga.c @@ -16,7 +16,7 @@ #include "fpga.h" #include "mvsmr.h" -Xilinx_Spartan3_Slave_Serial_fns fpga_fns = { +xilinx_spartan3_slave_serial_fns fpga_fns = { fpga_pre_config_fn, fpga_pgm_fn, fpga_clk_fn, @@ -26,8 +26,8 @@ Xilinx_Spartan3_Slave_Serial_fns fpga_fns = { 0 }; -Xilinx_desc spartan3 = { - Xilinx_Spartan2, +xilinx_desc spartan3 = { + xilinx_spartan2, slave_serial, XILINX_XC3S200_SIZE, (void *) &fpga_fns, |