projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
include
/
exports.h
diff --git
a/include/exports.h
b/include/exports.h
index
8f7f617
..
d6512cb
100644
(file)
--- a/
include/exports.h
+++ b/
include/exports.h
@@
-23,10
+23,15
@@
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);
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)
+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)
int i2c_write (uchar, uint, int , uchar* , int);
int i2c_read (uchar, uint, int , uchar* , int);
int i2c_write (uchar, uint, int , uchar* , int);
int i2c_read (uchar, uint, int , uchar* , int);
-#endif
/* CFG_CMD_I2C */
+#endif
void app_startup(char **);
void app_startup(char **);
@@
-40,7
+45,7
@@
enum {
XF_MAX
};
XF_MAX
};
-#define XF_VERSION
3
+#define XF_VERSION
4
#if defined(CONFIG_I386)
extern gd_t *global_data;
#if defined(CONFIG_I386)
extern gd_t *global_data;