Skip to contentSkip to conversation

exports.h: add required definitions from common.h

PATCH New Chris Packham 1 participant 1 message Jan 16, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 exports.h: add required definitions from common.h

To avoid symbol namespace conflicts between standalone applications and u-boot code add the definitions required in exports.h so standalone applications do not have to include common.h.

---
 examples/standalone/hello_world.c |    1 -
 include/exports.h                 |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/examples/standalone/hello_world.c
index 067c390..91a2deb 100644

examples/standalone/hello_world.c +0 -1
@@ -21,7 +21,6 @@
  * MA 02111-1307 USA
  */
 
-#include <common.h>
 #include <exports.h>
 
 int hello_world (int argc, char * const argv[])
include/exports.h +15 -0
index 63aa4b2..65b25a1 100644
@@ -3,6 +3,21 @@
 
 #ifndef __ASSEMBLY__
 
+#ifndef __COMMON_H_
+typedef unsigned char           uchar;
+typedef volatile unsigned long  vu_long;
+typedef volatile unsigned short vu_short;
+typedef volatile unsigned char  vu_char;
+
+#include <config.h>
+#include <asm-offsets.h>
+#include <linux/bitops.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <asm/ptrace.h>
+#include <stdarg.h>
+#endif /* ifndef __COMMON_H__ */
+
 /* These are declarations of exported functions available in C code */
 unsigned long get_version(void);
 int  getc(void);

--=20
1.7.10.2.dirty

On Wed, Jan 16, 2013 at 5:23 PM, Chris Packham <[email protected]>wro= te:

Quoted 27 lines

Hi,

I've just run into something porting an existing out of tree board to u-boot 2012.10 but I think it points to a generic issue for standalone applications.

Consider the following change

examples/standalone/hello_world.c +1 -1
index 067c390..d2e6a77 100644
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <exports.h>
 
-int hello_world (int argc, char * const argv[])
+int net_init (int argc, char * const argv[])
 {
        int i;
 

Because I'm not linking with the u-boot object file, I should be able to use any function name I like in my application as long as it isn't one of the functions in exports.h (at least in theory). Unfortunately I end up with the following compiler error

Quoted 1 line

hello_world.c:27: error: conflicting types for =E2=80=98net_init=E2=80=

=99

Quoted 1 line

uboot/include/net.h:489: error: previous declaration of =E2=80=98net_in=

it=E2=80=99 was

Quoted 4 lines

here
make[1]: *** [hello_world.o] Error 1

If I replace #include <common.h> in my app with the first hunk of include=

s

Quoted 3 lines

from the top of common.h then I can compile just fine.

I was wondering if it made sense to people to have standalone application=

s

Quoted 9 lines

define something like __STANDALONE__ either via CPPFLAGS or in the source itself and use the presence of that to exclude the majority of common.h when used in standalone applications. Or alternatively move the required bits to exports.h.

Thanks,
Chris

--e89a8ff1c58499a81b04d3607e6f--