X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fexports.h;h=94925664ee6eccc8318b10854071d18614665209;hb=d786882db223db2a48071a86af0777002f77c764;hp=d6512cb3a45a1ed738ad9768d7a909469cb736cf;hpb=29eaae953476f2bba4d5c7ac097b96cd827c1dff;p=oweals%2Fu-boot.git

diff --git a/include/exports.h b/include/exports.h
index d6512cb3a4..94925664ee 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -11,29 +11,28 @@ int  getc(void);
 int  tstc(void);
 void putc(const char);
 void puts(const char*);
-void printf(const char* fmt, ...);
+int printf(const char* fmt, ...);
 void install_hdlr(int, interrupt_handler_t*, void*);
 void free_hdlr(int);
 void *malloc(size_t);
 void free(void*);
-void udelay(unsigned long);
+void __udelay(unsigned long);
 unsigned long get_timer(unsigned long);
-void vprintf(const char *, va_list);
-void do_reset (void);
+int vprintf(const char *, va_list);
 unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base);
-char *getenv (char *name);
-void setenv (char *varname, char *varvalue);
+int strict_strtoul(const char *cp, unsigned int base, unsigned long *res);
+char *getenv (const char *name);
+int setenv (const char *varname, const char *varvalue);
 long simple_strtol(const char *cp,char **endp,unsigned int base);
 int strcmp(const char * cs,const char * ct);
-#ifdef CONFIG_HAS_UID
-void forceenv (char *varname, char *varvalue);
-#endif
+int ustrtoul(const char *cp, char **endp, unsigned int base);
 #if defined(CONFIG_CMD_I2C)
 int i2c_write (uchar, uint, int , uchar* , int);
 int i2c_read (uchar, uint, int , uchar* , int);
 #endif
+#include <spi.h>
 
-void app_startup(char **);
+void app_startup(char * const *);
 
 #endif    /* ifndef __ASSEMBLY__ */
 
@@ -45,9 +44,9 @@ enum {
 	XF_MAX
 };
 
-#define XF_VERSION	4
+#define XF_VERSION	6
 
-#if defined(CONFIG_I386)
+#if defined(CONFIG_X86)
 extern gd_t *global_data;
 #endif