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

Signed-off-by: Alexander Dahl <a...@thorsis.com>
---
 drivers/fpga/cyclon2.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 3b008facb8..7dc241b269 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -5,18 +5,14 @@
  * Based on ACE1XK.c
  */
 
+#define LOG_CATEGORY UCLASS_FPGA
+
 #include <common.h>            /* core U-Boot definitions */
+#include <log.h>
 #include <altera.h>
 #include <ACEX1K.h>            /* ACEX device family */
 #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
  * 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
@@ -42,7 +38,7 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t 
bsize)
 
        switch (desc->iface) {
        case passive_serial:
-               PRINTF("%s: Launching Passive Serial Loader\n", __func__);
+               log_debug("%s: Launching Passive Serial Loader\n", __func__);
                ret_val = CYC2_ps_load(desc, buf, bsize);
                break;
 
@@ -51,8 +47,8 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t 
bsize)
                 * done in the write() callback. Use the existing PS load
                 * function for FPP, too.
                 */
-               PRINTF("%s: Launching Fast Passive Parallel Loader\n",
-                      __func__);
+               log_debug("%s: Launching Fast Passive Parallel Loader\n",
+                         __func__);
                ret_val = CYC2_ps_load(desc, buf, bsize);
                break;
 
@@ -72,7 +68,7 @@ int CYC2_dump(Altera_desc *desc, const void *buf, size_t 
bsize)
 
        switch (desc->iface) {
        case passive_serial:
-               PRINTF("%s: Launching Passive Serial Dump\n", __func__);
+               log_debug("%s: Launching Passive Serial Dump\n", __func__);
                ret_val = CYC2_ps_dump(desc, buf, bsize);
                break;
 
@@ -99,14 +95,14 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, 
size_t bsize)
        Altera_CYC2_Passive_Serial_fns *fn = desc->iface_fns;
        int     ret = 0;
 
-       PRINTF("%s: start with interface functions @ 0x%p\n",
-              __func__, fn);
+       log_debug("%s: start with interface functions @ 0x%p\n",
+                 __func__, fn);
 
        if (fn) {
                int cookie = desc->cookie;      /* make a local copy */
                unsigned long ts;               /* timestamp */
 
-               PRINTF("%s: Function Table:\n"
+               log_debug("%s: Function Table:\n"
                                "ptr:\t0x%p\n"
                                "struct: 0x%p\n"
                                "config:\t0x%p\n"
-- 
2.30.2

Reply via email to