summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Partington <mparting@lexmark.com>2010-10-27 10:31:09 +0000
committerWolfgang Denk <wd@denx.de>2011-12-06 20:52:35 +0100
commit0910d0bcb85acdf09b9dfd8ded452367b540a4ad (patch)
treecbd67d5cc3e23ee070d6551ad8c0e11f55c9fc56
parenta621614d0cda202408f6f500bbb46b92e599e98b (diff)
downloadtalos-obmc-uboot-0910d0bcb85acdf09b9dfd8ded452367b540a4ad.tar.gz
talos-obmc-uboot-0910d0bcb85acdf09b9dfd8ded452367b540a4ad.zip
Standalone Apps: Standalone apps should need only exports.h.
Modify exports.h to remove its dependencies on other files, thus enabling standalone apps to require only exports.h from the U-Boot source tree. This appears to be the intent based on the following note: http://lists.denx.de/pipermail/u-boot/2010-January/067174.html Signed-off-by: Mike Partington <mparting@lexmark.com>
-rw-r--r--examples/standalone/atmel_df_pow2.c1
-rw-r--r--examples/standalone/stubs.c1
-rw-r--r--include/exports.h5
3 files changed, 3 insertions, 4 deletions
diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index b5b450317d..2e14aba390 100644
--- a/examples/standalone/atmel_df_pow2.c
+++ b/examples/standalone/atmel_df_pow2.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <exports.h>
+#include <spi.h>
#define CMD_ID 0x9f
#define CMD_STAT 0xd7
diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c
index 11c756525a..a6add6abcd 100644
--- a/examples/standalone/stubs.c
+++ b/examples/standalone/stubs.c
@@ -1,3 +1,4 @@
+#include <common.h>
#include <exports.h>
#ifndef GCC_VERSION
diff --git a/include/exports.h b/include/exports.h
index 94925664ee..63aa4b264a 100644
--- a/include/exports.h
+++ b/include/exports.h
@@ -3,8 +3,6 @@
#ifndef __ASSEMBLY__
-#include <common.h>
-
/* These are declarations of exported functions available in C code */
unsigned long get_version(void);
int getc(void);
@@ -12,7 +10,7 @@ int tstc(void);
void putc(const char);
void puts(const char*);
int printf(const char* fmt, ...);
-void install_hdlr(int, interrupt_handler_t*, void*);
+void install_hdlr(int, void (*interrupt_handler_t)(void *), void*);
void free_hdlr(int);
void *malloc(size_t);
void free(void*);
@@ -30,7 +28,6 @@ int ustrtoul(const char *cp, char **endp, unsigned int base);
int i2c_write (uchar, uint, int , uchar* , int);
int i2c_read (uchar, uint, int , uchar* , int);
#endif
-#include <spi.h>
void app_startup(char * const *);
OpenPOWER on IntegriCloud