projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[oweals/u-boot.git]
/
drivers
/
fpga
/
lattice.c
diff --git
a/drivers/fpga/lattice.c
b/drivers/fpga/lattice.c
index c3b2355f9418c840e8727190b8daabec77e99b65..d8b642a6bc7a4394216e8abab325edd72ec2fe1a 100644
(file)
--- a/
drivers/fpga/lattice.c
+++ b/
drivers/fpga/lattice.c
@@
-34,7
+34,7
@@
#include <lattice.h>
static lattice_board_specific_func *pfns;
#include <lattice.h>
static lattice_board_specific_func *pfns;
-static char *fpga_image;
+static c
onst c
har *fpga_image;
static unsigned long read_bytes;
static unsigned long bufsize;
static unsigned short expectedCRC;
static unsigned long read_bytes;
static unsigned long bufsize;
static unsigned short expectedCRC;
@@
-302,7
+302,7
@@
static int lattice_validate(Lattice_desc *desc, const char *fn)
return ret_val;
}
return ret_val;
}
-int lattice_load(Lattice_desc *desc, void *buf, size_t bsize)
+int lattice_load(Lattice_desc *desc,
const
void *buf, size_t bsize)
{
int ret_val = FPGA_FAIL;
{
int ret_val = FPGA_FAIL;
@@
-317,7
+317,7
@@
int lattice_load(Lattice_desc *desc, void *buf, size_t bsize)
read_bytes = 0;
bufsize = bsize;
debug("%s: Launching the Lattice ISPVME Loader:"
read_bytes = 0;
bufsize = bsize;
debug("%s: Launching the Lattice ISPVME Loader:"
- " addr
0x%x size 0x%
x...\n",
+ " addr
%p size 0x%l
x...\n",
__func__, fpga_image, bufsize);
ret_val = ispVM();
if (ret_val)
__func__, fpga_image, bufsize);
ret_val = ispVM();
if (ret_val)
@@
-335,7
+335,7
@@
int lattice_load(Lattice_desc *desc, void *buf, size_t bsize)
return ret_val;
}
return ret_val;
}
-int lattice_dump(Lattice_desc *desc, void *buf, size_t bsize)
+int lattice_dump(Lattice_desc *desc,
const
void *buf, size_t bsize)
{
puts("Dump not supported for Lattice FPGA\n");
{
puts("Dump not supported for Lattice FPGA\n");