projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
[oweals/u-boot.git]
/
include
/
exports.h
diff --git
a/include/exports.h
b/include/exports.h
index 6377875bc9a9a151f8b182a32c32c0b1458fd7a7..2e8fd8b8b41331dcee601ae07e95231201b1ab14 100644
(file)
--- a/
include/exports.h
+++ b/
include/exports.h
@@
-25,6
+25,7
@@
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 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
#ifdef CONFIG_HAS_UID
void forceenv (char *varname, char *varvalue);
#endif
@@
-32,6
+33,7
@@
void forceenv (char *varname, char *varvalue);
int i2c_write (uchar, uint, int , uchar* , int);
int i2c_read (uchar, uint, int , uchar* , int);
#endif
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 **);
@@
-45,7
+47,7
@@
enum {
XF_MAX
};
XF_MAX
};
-#define XF_VERSION
4
+#define XF_VERSION
6
#if defined(CONFIG_I386)
extern gd_t *global_data;
#if defined(CONFIG_I386)
extern gd_t *global_data;