leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpga: ACEX1K: Use logging feature instead of FPGA_DEBUG

Browse Source 
Instead of using DEBUG or LOG_DEBUG the driver still had its own
definition for debug output.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20221007122003.11239-8-ada@thorsis.com
This commit is contained in:
Alexander Dahl
2022-10-07 14:20:00 +02:00
committed by Michal Simek
parent 29e58112ed
commit 40923f5611
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/fpga/ACEX1K.c
View File

@@ -7,18 +7,14 @@
* Rich Ireland, Enterasys Networks, rireland@enterasys.com. * Rich Ireland, Enterasys Networks, rireland@enterasys.com.
*/ */
#define LOG_CATEGORY UCLASS_FPGA
#include <common.h> /* core U-Boot definitions */ #include <common.h> /* core U-Boot definitions */
#include <console.h> #include <console.h>
#include <log.h>
#include <ACEX1K.h> /* ACEX device family */ #include <ACEX1K.h> /* ACEX device family */
#include <linux/delay.h> #include <linux/delay.h>
/* Define FPGA_DEBUG to get debug printf's */
#ifdef FPGA_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#else
#define PRINTF(fmt,args...)
#endif
/* Note: The assumption is that we cannot possibly run fast enough to /* Note: The assumption is that we cannot possibly run fast enough to
* overrun the device (the Slave Parallel mode can free run at 50MHz). * overrun the device (the Slave Parallel mode can free run at 50MHz).
* If there is a need to operate slower, define CONFIG_FPGA_DELAY in * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
@@ -44,7 +40,7 @@ int ACEX1K_load(Altera_desc *desc, const void *buf, size_t bsize)
switch (desc->iface) { switch (desc->iface) {
case passive_serial: case passive_serial:
PRINTF ("%s: Launching Passive Serial Loader\n", __FUNCTION__); log_debug("Launching Passive Serial Loader\n");
ret_val = ACEX1K_ps_load (desc, buf, bsize); ret_val = ACEX1K_ps_load (desc, buf, bsize);
break; break;
@@ -64,7 +60,7 @@ int ACEX1K_dump(Altera_desc *desc, const void *buf, size_t bsize)
switch (desc->iface) { switch (desc->iface) {
case passive_serial: case passive_serial:
PRINTF ("%s: Launching Passive Serial Dump\n", __FUNCTION__); log_debug("Launching Passive Serial Dump\n");
ret_val = ACEX1K_ps_dump (desc, buf, bsize); ret_val = ACEX1K_ps_dump (desc, buf, bsize);
break; break;
@@ -93,8 +89,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
Altera_ACEX1K_Passive_Serial_fns *fn = desc->iface_fns; Altera_ACEX1K_Passive_Serial_fns *fn = desc->iface_fns;
int i; int i;
PRINTF ("%s: start with interface functions @ 0x%p\n", log_debug("start with interface functions @ 0x%p\n", fn);
__FUNCTION__, fn);
if (fn) { if (fn) {
size_t bytecount = 0; size_t bytecount = 0;
@@ -102,16 +97,16 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
int cookie = desc->cookie; /* make a local copy */ int cookie = desc->cookie; /* make a local copy */
unsigned long ts; /* timestamp */ unsigned long ts; /* timestamp */
PRINTF ("%s: Function Table:\n" log_debug("Function Table:\n"
"ptr:\t0x%p\n" "ptr:\t0x%p\n"
"struct: 0x%p\n" "struct: 0x%p\n"
"config:\t0x%p\n" "config:\t0x%p\n"
"status:\t0x%p\n" "status:\t0x%p\n"
"clk:\t0x%p\n" "clk:\t0x%p\n"
"data:\t0x%p\n" "data:\t0x%p\n"
"done:\t0x%p\n\n", "done:\t0x%p\n\n",
__FUNCTION__, &fn, fn, fn->config, fn->status, &fn, fn, fn->config, fn->status,
fn->clk, fn->data, fn->done); fn->clk, fn->data, fn->done);
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
printf ("Loading FPGA Device %d...", cookie); printf ("Loading FPGA Device %d...", cookie);
#endif #endif