Merge branch 'next' of ../next

[platform/kernel/u-boot.git] / include / exports.h

diff --git a/include/exports.h b/include/exports.h
index b45a466..c3a5d2f 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -1,5 +1,5 @@
-#ifndef __MON_SYS_CALL_H__
-#define __MON_SYS_CALL_H__
+#ifndef __EXPORTS_H__
+#define __EXPORTS_H__
 
 #ifndef __ASSEMBLY__
 
@@ -16,8 +16,24 @@ 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);
+unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base);
+char *getenv (char *name);
+int setenv (char *varname, char *varvalue);
+long simple_strtol(const char *cp,char **endp,unsigned int base);
+int strcmp(const char * cs,const char * ct);
+int ustrtoul(const char *cp, char **endp, unsigned int base);
+#ifdef CONFIG_HAS_UID
+void forceenv (char *varname, char *varvalue);
+#endif
+#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 **);
 
@@ -31,6 +47,10 @@ enum {
        XF_MAX
 };
 
-#define XF_VERSION     1
+#define XF_VERSION     6
 
+#if defined(CONFIG_I386)
+extern gd_t *global_data;
 #endif
+
+#endif /* __EXPORTS_H__ */