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

fpga: cyclon2: 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-7-ada@thorsis.com
This commit is contained in:
Alexander Dahl
2022-10-07 14:19:59 +02:00
committed by Michal Simek
parent 6c62e8ffd9
commit 29e58112ed
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/fpga/cyclon2.c
View File

@@ -5,18 +5,14 @@
* Based on ACE1XK.c * Based on ACE1XK.c
*/ */
#define LOG_CATEGORY UCLASS_FPGA
#include <common.h> /* core U-Boot definitions */ #include <common.h> /* core U-Boot definitions */
#include <log.h>
#include <altera.h> #include <altera.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
@@ -42,7 +38,7 @@ int CYC2_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", __func__); log_debug("Launching Passive Serial Loader\n");
ret_val = CYC2_ps_load(desc, buf, bsize); ret_val = CYC2_ps_load(desc, buf, bsize);
break; break;
@@ -51,8 +47,7 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t bsize)
* done in the write() callback. Use the existing PS load * done in the write() callback. Use the existing PS load
* function for FPP, too. * function for FPP, too.
*/ */
PRINTF("%s: Launching Fast Passive Parallel Loader\n", log_debug("Launching Fast Passive Parallel Loader\n");
__func__);
ret_val = CYC2_ps_load(desc, buf, bsize); ret_val = CYC2_ps_load(desc, buf, bsize);
break; break;
@@ -72,7 +67,7 @@ int CYC2_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", __func__); log_debug("Launching Passive Serial Dump\n");
ret_val = CYC2_ps_dump(desc, buf, bsize); ret_val = CYC2_ps_dump(desc, buf, bsize);
break; break;
@@ -99,21 +94,20 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
Altera_CYC2_Passive_Serial_fns *fn = desc->iface_fns; Altera_CYC2_Passive_Serial_fns *fn = desc->iface_fns;
int ret = 0; int ret = 0;
PRINTF("%s: start with interface functions @ 0x%p\n", log_debug("start with interface functions @ 0x%p\n", fn);
__func__, fn);
if (fn) { if (fn) {
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"
"write:\t0x%p\n" "write:\t0x%p\n"
"done:\t0x%p\n\n", "done:\t0x%p\n\n",
__func__, &fn, fn, fn->config, fn->status, &fn, fn, fn->config, fn->status,
fn->write, fn->done); fn->write, 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);