Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[people/ms/u-boot.git] / drivers / fpga / spartan2.c

diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 0796729436cb9512d5f3ddd5e910d686d5e32534..859fb3c7787af8562336e6c7e378b70b9fb3c994 100644 (file)
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -41,7 +41,8 @@ static int spartan2_ss_dump(xilinx_desc *desc, const void *buf, size_t bsize);
 
 /* ------------------------------------------------------------------------- */
 /* Spartan-II Generic Implementation */
-int spartan2_load(xilinx_desc *desc, const void *buf, size_t bsize)
+static int spartan2_load(xilinx_desc *desc, const void *buf, size_t bsize,
+                        bitstream_type bstype)
 {
        int ret_val = FPGA_FAIL;
 
@@ -64,7 +65,7 @@ int spartan2_load(xilinx_desc *desc, const void *buf, size_t bsize)
        return ret_val;
 }
 
-int spartan2_dump(xilinx_desc *desc, const void *buf, size_t bsize)
+static int spartan2_dump(xilinx_desc *desc, const void *buf, size_t bsize)
 {
        int ret_val = FPGA_FAIL;
 
@@ -87,7 +88,7 @@ int spartan2_dump(xilinx_desc *desc, const void *buf, size_t bsize)
        return ret_val;
 }
 
-int spartan2_info(xilinx_desc *desc)
+static int spartan2_info(xilinx_desc *desc)
 {
        return FPGA_SUCCESS;
 }
@@ -447,3 +448,9 @@ static int spartan2_ss_dump(xilinx_desc *desc, const void *buf, size_t bsize)
                        __FUNCTION__);
        return FPGA_FAIL;
 }
+
+struct xilinx_fpga_op spartan2_op = {
+       .load = spartan2_load,
+       .dump = spartan2_dump,
+       .info = spartan2_info,
+};