Merge with /home/wd/git/u-boot/custodian/u-boot-arm

[karo-tx-uboot.git] / include / exports.h

diff --git a/include/exports.h b/include/exports.h
index b45a466914b390555ec5bb7bc217e16c8c9b9d17..8f7f61703c6c47519794996d65931018b3216d86 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__
 
@@ -18,6 +18,15 @@ void *malloc(size_t);
 void free(void*);
 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);
+void setenv (char *varname, char *varvalue);
+#if (CONFIG_COMMANDS & CFG_CMD_I2C)
+int i2c_write (uchar, uint, int , uchar* , int);
+int i2c_read (uchar, uint, int , uchar* , int);
+#endif /* CFG_CMD_I2C */
 
 void app_startup(char **);
 
@@ -31,6 +40,10 @@ enum {
        XF_MAX
 };
 
-#define XF_VERSION     1
+#define XF_VERSION     3
 
+#if defined(CONFIG_I386)
+extern gd_t *global_data;
 #endif
+
+#endif /* __EXPORTS_H__ */