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/gen860t/fpga.c | |
parent | e7d4a88e69459547a46906dbe021ccc83c614361 (diff) | |
parent | 31081859855e606ca06131c3a14e099e043d39f0 (diff) |
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'board/gen860t/fpga.c')
-rw-r--r-- | board/gen860t/fpga.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/gen860t/fpga.c b/board/gen860t/fpga.c index b7984dd0fec..dd0ef707d6d 100644 --- a/board/gen860t/fpga.c +++ b/board/gen860t/fpga.c @@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR; /* Note that these are pointers to code that is in Flash. They will be * relocated at runtime. */ -Xilinx_Virtex2_Slave_SelectMap_fns fpga_fns = { +xilinx_virtex2_slave_selectmap_fns fpga_fns = { fpga_pre_config_fn, fpga_pgm_fn, fpga_init_fn, @@ -56,8 +56,8 @@ Xilinx_Virtex2_Slave_SelectMap_fns fpga_fns = { fpga_post_config_fn }; -Xilinx_desc fpga[CONFIG_FPGA_COUNT] = { - {Xilinx_Virtex2, +xilinx_desc fpga[CONFIG_FPGA_COUNT] = { + {xilinx_virtex2, slave_selectmap, XILINX_XC2V3000_SIZE, (void *) &fpga_fns, |