arm: Add declarations to avoid needing to include headers

At present common.h includes various ARM-specific headers. In preparation
for dropping this, add a few explicit declarations.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h
index 436c35a6dc439c9d51eb82ff3ea7c2c1de61a37f..4c9bb863c0f1077b9ecbfd6ce03bafc1bc85178b 100644 (file)
--- a/arch/arm/include/asm/bootm.h
+++ b/arch/arm/include/asm/bootm.h
@@ -41,6 +41,7 @@ extern void udc_disconnect(void);
  #define BOOTM_ENABLE_INITRD_TAG       0
 #endif
 
+struct tag_serialnr;
 #ifdef CONFIG_SERIAL_TAG
  #define BOOTM_ENABLE_SERIAL_TAG       1
 void get_board_serial(struct tag_serialnr *serialnr);

diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 3a0d0b8675a0227e4331842703607a33b0b24c8a..ef4fca68ee95a14d7a9aa35aefe3f2466d5e2bfd 100644 (file)
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -47,6 +47,8 @@ ulong get_timer_masked        (void);
 void   udelay_masked           (unsigned long usec);
 
 /* calls to c from vectors.S */
+struct pt_regs;
+
 void bad_mode(void);
 void do_undefined_instruction(struct pt_regs *pt_regs);
 void do_software_interrupt(struct pt_regs *pt_regs);

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index eb242223b4c0ae87a254522a36f2227f34bac436..704849bd0c7e4dc659ee07c89dc1885be1d845ca 100644 (file)
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -31,6 +31,7 @@
 #ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
 #endif
+#include <asm/setup.h>
 
 DECLARE_GLOBAL_DATA_PTR;