X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=include%2Fexports.h;h=1a01e430bbc60cac93c7dd6e4ca05a22364bff86;hb=b1fc6e6e8d6dd422bdb498f0c228b7da5f31d52c;hp=d6512cb3a45a1ed738ad9768d7a909469cb736cf;hpb=19909edb97140a5ea3139705589bb90e023ab5e1;p=karo-tx-uboot.git

diff --git a/include/exports.h b/include/exports.h
index d6512cb3a4..1a01e430bb 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -3,7 +3,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <common.h>
+struct spi_slave;
 
 /* These are declarations of exported functions available in C code */
 unsigned long get_version(void);
@@ -11,43 +11,44 @@ int  getc(void);
 int  tstc(void);
 void putc(const char);
 void puts(const char*);
-void printf(const char* fmt, ...);
-void install_hdlr(int, interrupt_handler_t*, void*);
+int printf(const char* fmt, ...);
+void install_hdlr(int, interrupt_handler_t, void*);
 void free_hdlr(int);
 void *malloc(size_t);
+#ifndef CONFIG_SYS_MALLOC_SIMPLE
 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);
-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
-#if defined(CONFIG_CMD_I2C)
+void __udelay(unsigned long);
+unsigned long get_timer(unsigned long);
+int vprintf(const char *, va_list);
+unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base);
+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);
+unsigned long ustrtoul(const char *cp, char **endp, unsigned int base);
+unsigned long long ustrtoull(const char *cp, char **endp, unsigned int base);
+#if defined(CONFIG_CMD_I2C) && \
+		(!defined(CONFIG_DM_I2C) || defined(CONFIG_DM_I2C_COMPAT))
 int i2c_write (uchar, uint, int , uchar* , int);
 int i2c_read (uchar, uint, int , uchar* , int);
 #endif
 
-void app_startup(char **);
+void app_startup(char * const *);
 
 #endif    /* ifndef __ASSEMBLY__ */
 
-enum {
-#define EXPORT_FUNC(x) XF_ ## x ,
+struct jt_funcs {
+#define EXPORT_FUNC(impl, res, func, ...) res(*func)(__VA_ARGS__);
 #include <_exports.h>
 #undef EXPORT_FUNC
-
-	XF_MAX
 };
 
-#define XF_VERSION	4
 
-#if defined(CONFIG_I386)
+#define XF_VERSION	7
+
+#if defined(CONFIG_X86)
 extern gd_t *global_data;
 #endif