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 with /home/stefan/git/u-boot/denx
[oweals/u-boot.git]
/
common
/
fpga.c
diff --git
a/common/fpga.c
b/common/fpga.c
index 02d3e42b3bbf076db365aba7d9a59c104d52ff9b..2eff239c47863bd59d44fb451c964ac8f47a19e3 100644
(file)
--- a/
common/fpga.c
+++ b/
common/fpga.c
@@
-139,7
+139,7
@@
static int fpga_dev_info( int devnum )
printf( "Xilinx Device\nDescriptor @ 0x%p\n", desc );
ret_val = xilinx_info( desc->devdesc );
#else
printf( "Xilinx Device\nDescriptor @ 0x%p\n", desc );
ret_val = xilinx_info( desc->devdesc );
#else
- fpga_no_sup( __FUNCTION__, "Xilinx devices" );
+ fpga_no_sup(
(char *)
__FUNCTION__, "Xilinx devices" );
#endif
break;
case fpga_altera:
#endif
break;
case fpga_altera:
@@
-178,7
+178,7
@@
int fpga_reloc( fpga_type devtype, void *desc, ulong reloc_off )
#if CONFIG_FPGA & CFG_FPGA_XILINX
ret_val = xilinx_reloc( desc, reloc_off );
#else
#if CONFIG_FPGA & CFG_FPGA_XILINX
ret_val = xilinx_reloc( desc, reloc_off );
#else
- fpga_no_sup( __FUNCTION__, "Xilinx devices" );
+ fpga_no_sup(
(char *)
__FUNCTION__, "Xilinx devices" );
#endif
break;
case fpga_altera:
#endif
break;
case fpga_altera:
@@
-271,7
+271,7
@@
int fpga_load( int devnum, void *buf, size_t bsize )
#if CONFIG_FPGA & CFG_FPGA_XILINX
ret_val = xilinx_load( desc->devdesc, buf, bsize );
#else
#if CONFIG_FPGA & CFG_FPGA_XILINX
ret_val = xilinx_load( desc->devdesc, buf, bsize );
#else
- fpga_no_sup( __FUNCTION__, "Xilinx devices" );
+ fpga_no_sup(
(char *)
__FUNCTION__, "Xilinx devices" );
#endif
break;
case fpga_altera:
#endif
break;
case fpga_altera:
@@
-304,7
+304,7
@@
int fpga_dump( int devnum, void *buf, size_t bsize )
#if CONFIG_FPGA & CFG_FPGA_XILINX
ret_val = xilinx_dump( desc->devdesc, buf, bsize );
#else
#if CONFIG_FPGA & CFG_FPGA_XILINX
ret_val = xilinx_dump( desc->devdesc, buf, bsize );
#else
- fpga_no_sup( __FUNCTION__, "Xilinx devices" );
+ fpga_no_sup(
(char *)
__FUNCTION__, "Xilinx devices" );
#endif
break;
case fpga_altera:
#endif
break;
case fpga_altera: