V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

FPGA: use debug() instead of module debug printf 

Replace also __FUNCTION__ with standard __func__

Signed-off-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Stefano Babic 2011-12-28 06:47:01 +00:00 committed by Wolfgang Denk
parent 28cdc1c8e2
commit 06297db066
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
common/cmd_fpga.c
View File

@ -33,16 +33,6 @@
#include <fpga.h> #include <fpga.h>
#include <malloc.h> #include <malloc.h>
#if 0
#define FPGA_DEBUG
#endif
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#else
#define PRINTF(fmt,args...)
#endif
/* Local functions */ /* Local functions */
static int fpga_get_op (char *opstr); static int fpga_get_op (char *opstr);
@ -76,8 +66,9 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
length = (*dataptr << 8) + *(dataptr+1); length = (*dataptr << 8) + *(dataptr+1);
dataptr+=2; dataptr+=2;
if (*dataptr++ != 0x61) { if (*dataptr++ != 0x61) {
PRINTF ("%s: Design name identifier not recognized in bitstream\n", debug("%s: Design name identifier not recognized "
__FUNCTION__ ); "in bitstream\n",
__func__);
return FPGA_FAIL; return FPGA_FAIL;
} }
@ -90,8 +81,9 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
/* get part number (identifier, length, string) */ /* get part number (identifier, length, string) */
if (*dataptr++ != 0x62) { if (*dataptr++ != 0x62) {
printf("%s: Part number identifier not recognized in bitstream\n", printf("%s: Part number identifier not recognized "
__FUNCTION__ ); "in bitstream\n",
__func__);
return FPGA_FAIL; return FPGA_FAIL;
} }
@ -104,7 +96,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
/* get date (identifier, length, string) */ /* get date (identifier, length, string) */
if (*dataptr++ != 0x63) { if (*dataptr++ != 0x63) {
printf("%s: Date identifier not recognized in bitstream\n", printf("%s: Date identifier not recognized in bitstream\n",
__FUNCTION__); __func__);
return FPGA_FAIL; return FPGA_FAIL;
} }
@ -116,7 +108,8 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
/* get time (identifier, length, string) */ /* get time (identifier, length, string) */
if (*dataptr++ != 0x64) { if (*dataptr++ != 0x64) {
printf("%s: Time identifier not recognized in bitstream\n",__FUNCTION__); printf("%s: Time identifier not recognized in bitstream\n",
__func__);
return FPGA_FAIL; return FPGA_FAIL;
} }
@ -129,7 +122,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
/* get fpga data length (identifier, length) */ /* get fpga data length (identifier, length) */
if (*dataptr++ != 0x65) { if (*dataptr++ != 0x65) {
printf("%s: Data length identifier not recognized in bitstream\n", printf("%s: Data length identifier not recognized in bitstream\n",
__FUNCTION__); __func__);
return FPGA_FAIL; return FPGA_FAIL;
} }
swapsize = ((unsigned int) *dataptr <<24) + swapsize = ((unsigned int) *dataptr <<24) +
@ -183,39 +176,43 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
if (fit_parse_subimage (argv[3], (ulong)fpga_data, if (fit_parse_subimage (argv[3], (ulong)fpga_data,
&fit_addr, &fit_uname)) { &fit_addr, &fit_uname)) {
fpga_data = (void *)fit_addr; fpga_data = (void *)fit_addr;
debug ("* fpga: subimage '%s' from FIT image at 0x%08lx\n", debug("* fpga: subimage '%s' from FIT image "
fit_uname, fit_addr); "at 0x%08lx\n",
fit_uname, fit_addr);
} else } else
#endif #endif
{ {
fpga_data = (void *) simple_strtoul (argv[3], NULL, 16); fpga_data = (void *) simple_strtoul (argv[3], NULL, 16);
debug ("* fpga: cmdline image address = 0x%08lx\n", (ulong)fpga_data); debug("* fpga: cmdline image address = 0x%08lx\n",
(ulong)fpga_data);
} }
PRINTF ("%s: fpga_data = 0x%x\n", __FUNCTION__, (uint) fpga_data); debug("%s: fpga_data = 0x%x\n", __func__, (uint) fpga_data);
case 3: /* fpga <op> <dev | data addr> */ case 3: /* fpga <op> <dev | data addr> */
dev = (int) simple_strtoul (argv[2], NULL, 16); dev = (int) simple_strtoul (argv[2], NULL, 16);
PRINTF ("%s: device = %d\n", __FUNCTION__, dev); debug("%s: device = %d\n", __func__, dev);
/* FIXME - this is a really weak test */ /* FIXME - this is a really weak test */
if ((argc == 3) && (dev > fpga_count ())) { /* must be buffer ptr */ if ((argc == 3) && (dev > fpga_count ())) { /* must be buffer ptr */
PRINTF ("%s: Assuming buffer pointer in arg 3\n", debug("%s: Assuming buffer pointer in arg 3\n",
__FUNCTION__); __func__);
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
if (fit_parse_subimage (argv[2], (ulong)fpga_data, if (fit_parse_subimage (argv[2], (ulong)fpga_data,
&fit_addr, &fit_uname)) { &fit_addr, &fit_uname)) {
fpga_data = (void *)fit_addr; fpga_data = (void *)fit_addr;
debug ("* fpga: subimage '%s' from FIT image at 0x%08lx\n", debug("* fpga: subimage '%s' from FIT image "
fit_uname, fit_addr); "at 0x%08lx\n",
fit_uname, fit_addr);
} else } else
#endif #endif
{ {
fpga_data = (void *) dev; fpga_data = (void *) dev;
debug ("* fpga: cmdline image address = 0x%08lx\n", (ulong)fpga_data); debug("* fpga: cmdline image address = "
"0x%08lx\n", (ulong)fpga_data);
} }
PRINTF ("%s: fpga_data = 0x%x\n", debug("%s: fpga_data = 0x%x\n",
__FUNCTION__, (uint) fpga_data); __func__, (uint) fpga_data);
dev = FPGA_INVALID_DEVICE; /* reset device num */ dev = FPGA_INVALID_DEVICE; /* reset device num */
} }
@ -224,8 +221,8 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
break; break;
default: default:
PRINTF ("%s: Too many or too few args (%d)\n", debug("%s: Too many or too few args (%d)\n",
__FUNCTION__, argc); __func__, argc);
op = FPGA_NONE; /* force usage display */ op = FPGA_NONE; /* force usage display */
break; break;
} }