Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index 05a658cdf90238aa46d809e29e30741092932471..3df1defab16f3f690b7d6880b96046e48f46ed95 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -285,6 +285,13 @@ extern ulong monitor_flash_len;
 int mac_read_from_eeprom(void);
 extern u8 _binary_dt_dtb_start[];      /* embedded device tree blob */
 
+/*
+ * Called when console output is requested before the console is available.
+ * The board should do its best to get the character out to the user any way
+ * it can.
+ */
+void board_pre_console_putc(int ch);
+
 /* common/flash.c */
 void flash_perror (int);
 
@@ -726,16 +733,7 @@ void uuid_str_to_bin(const char *uuid, unsigned char *out);
 int uuid_str_valid(const char *uuid);
 
 /* lib/vsprintf.c */
-ulong  simple_strtoul(const char *cp,char **endp,unsigned int base);
-int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
-unsigned long long     simple_strtoull(const char *cp,char **endp,unsigned int base);
-long   simple_strtol(const char *cp,char **endp,unsigned int base);
-void   panic(const char *fmt, ...)
-               __attribute__ ((format (__printf__, 1, 2), noreturn));
-int    sprintf(char * buf, const char *fmt, ...)
-               __attribute__ ((format (__printf__, 2, 3)));
-int    vsprintf(char *buf, const char *fmt, va_list args);
-char *simple_itoa(ulong i);
+#include <vsprintf.h>
 
 /* lib/strmhz.c */
 char * strmhz(char *buf, unsigned long hz);