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>

diff --git a/examples/standalone/atmel_df_pow2.c b/examples/standalone/atmel_df_pow2.c
index b5b450317d942e5ea883f05eb5580b418f646b99..2e14aba390e62d0974330c16069792f52f769568 100644 (file)
--- 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 11c756525ae57ad813192a4f160ff7af39c1d7e5..a6add6abcd4c433f1a580a976b3b7a973ec87cc1 100644 (file)
--- 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 94925664ee6eccc8318b10854071d18614665209..63aa4b264a17e70687c5e2aab8851d374f2a9b45 100644 (file)
--- 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 *);