colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / examples / api / libgenwrap.c

diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c
index c1afa5bc09a1f155fd957ce1a6a3cb12c1bffa9b..3aa222866ff50bbf5f6f37866348e282b30659af 100644 (file)
--- a/examples/api/libgenwrap.c
+++ b/examples/api/libgenwrap.c
@@ -1,61 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * This is is a set of wrappers/stubs that allow to use certain routines from
  * U-Boot's lib in the standalone app. This way way we can re-use
  * existing code e.g. operations on strings and similar.
  */
 
 #include <common.h>
+#include <command.h>
+#include <hang.h>
+#include <linux/delay.h>
 #include <linux/types.h>
 #include <api_public.h>
 
 #include "glue.h"
 
-/*
- * printf() and vprintf() are stolen from u-boot/common/console.c
- */
-int printf (const char *fmt, ...)
+void putc(const char c)
 {
-       va_list args;
-       uint i;
-       char printbuffer[256];
-
-       va_start (args, fmt);
-
-       /* For this to work, printbuffer must be larger than
-        * anything we ever want to print.
-        */
-       i = vsprintf (printbuffer, fmt, args);
-       va_end (args);
-
-       /* Print the string */
-       ub_puts (printbuffer);
-       return i;
-}
-
-int vprintf (const char *fmt, va_list args)
-{
-       uint i;
-       char printbuffer[256];
-
-       /* For this to work, printbuffer must be larger than
-        * anything we ever want to print.
-        */
-       i = vsprintf (printbuffer, fmt, args);
-
-       /* Print the string */
-       ub_puts (printbuffer);
-       return i;
+       ub_putc(c);
 }
 
-void putc (const char c)
+void puts(const char *s)
 {
-       ub_putc(c);
+       ub_puts(s);
 }
 
 void __udelay(unsigned long usec)
@@ -63,7 +33,7 @@ void __udelay(unsigned long usec)
        ub_udelay(usec);
 }
 
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        ub_reset();
        return 0;
@@ -74,7 +44,7 @@ void *malloc (size_t len)
        return NULL;
 }
 
-void hang (void)
+void hang(void)
 {
        while (1) ;
 }