random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fpga: spartan2: 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-9-ada@thorsis.com
This commit is contained in:
Alexander Dahl 2022-10-07 14:20:01 +02:00 committed by Michal Simek
parent 40923f5611
commit bc33b69604
1 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/fpga/spartan2.c
View File

@ -4,15 +4,11 @@
* Rich Ireland, Enterasys Networks, rireland@enterasys.com. * Rich Ireland, Enterasys Networks, rireland@enterasys.com.
*/ */
#include <common.h> /* core U-Boot definitions */ #define LOG_CATEGORY UCLASS_FPGA
#include <spartan2.h> /* Spartan-II device family */
/* Define FPGA_DEBUG to get debug printf's */ #include <common.h> /* core U-Boot definitions */
#ifdef FPGA_DEBUG #include <log.h>
#define PRINTF(fmt,args...) printf (fmt ,##args) #include <spartan2.h> /* Spartan-II device family */
#else
#define PRINTF(fmt,args...)
#endif
#undef CONFIG_SYS_FPGA_CHECK_BUSY #undef CONFIG_SYS_FPGA_CHECK_BUSY
@ -46,12 +42,12 @@ static int spartan2_load(xilinx_desc *desc, const void *buf, size_t bsize,
switch (desc->iface) { switch (desc->iface) {
case slave_serial: case slave_serial:
PRINTF ("%s: Launching Slave Serial Load\n", __FUNCTION__); log_debug("Launching Slave Serial Load\n");
ret_val = spartan2_ss_load(desc, buf, bsize); ret_val = spartan2_ss_load(desc, buf, bsize);
break; break;
case slave_parallel: case slave_parallel:
PRINTF ("%s: Launching Slave Parallel Load\n", __FUNCTION__); log_debug("Launching Slave Parallel Load\n");
ret_val = spartan2_sp_load(desc, buf, bsize); ret_val = spartan2_sp_load(desc, buf, bsize);
break; break;
@ -69,12 +65,12 @@ static int spartan2_dump(xilinx_desc *desc, const void *buf, size_t bsize)
switch (desc->iface) { switch (desc->iface) {
case slave_serial: case slave_serial:
PRINTF ("%s: Launching Slave Serial Dump\n", __FUNCTION__); log_debug("Launching Slave Serial Dump\n");
ret_val = spartan2_ss_dump(desc, buf, bsize); ret_val = spartan2_ss_dump(desc, buf, bsize);
break; break;
case slave_parallel: case slave_parallel:
PRINTF ("%s: Launching Slave Parallel Dump\n", __FUNCTION__); log_debug("Launching Slave Parallel Dump\n");
ret_val = spartan2_sp_dump(desc, buf, bsize); ret_val = spartan2_sp_dump(desc, buf, bsize);
break; break;
@ -100,8 +96,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
int ret_val = FPGA_FAIL; /* assume the worst */ int ret_val = FPGA_FAIL; /* assume the worst */
xilinx_spartan2_slave_parallel_fns *fn = desc->iface_fns; xilinx_spartan2_slave_parallel_fns *fn = desc->iface_fns;
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;
@ -109,7 +104,7 @@ static int spartan2_sp_load(xilinx_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"
"pre: 0x%p\n" "pre: 0x%p\n"
@ -124,7 +119,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
"busy:\t0x%p\n" "busy:\t0x%p\n"
"abort:\t0x%p\n" "abort:\t0x%p\n"
"post:\t0x%p\n\n", "post:\t0x%p\n\n",
__FUNCTION__, &fn, fn, fn->pre, fn->pgm, fn->init, fn->err, &fn, fn, fn->pre, fn->pgm, fn->init, fn->err,
fn->clk, fn->cs, fn->wr, fn->rdata, fn->wdata, fn->busy, fn->clk, fn->cs, fn->wr, fn->rdata, fn->wdata, fn->busy,
fn->abort, fn->post); fn->abort, fn->post);
@ -302,8 +297,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
int i; int i;
unsigned char val; unsigned char val;
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;
@ -311,7 +305,7 @@ static int spartan2_ss_load(xilinx_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"
"pgm:\t0x%p\n" "pgm:\t0x%p\n"
@ -319,7 +313,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
"clk:\t0x%p\n" "clk:\t0x%p\n"
"wr:\t0x%p\n" "wr:\t0x%p\n"
"done:\t0x%p\n\n", "done:\t0x%p\n\n",
__FUNCTION__, &fn, fn, fn->pgm, fn->init, &fn, fn, fn->pgm, fn->init,
fn->clk, fn->wr, fn->done); fn->clk, fn->wr, fn->done);
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
printf ("Loading FPGA Device %d...\n", cookie); printf ("Loading FPGA Device %d...\n", cookie);