common: Move trap_init() out of common.h

Move this function into the init.h header file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>

diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index 5d8020774538b1e581d834f773a7c7368613873f..2ccd55add0c2a529c2a7cc4e45668c411be40f0e 100644 (file)
--- a/arch/m68k/lib/traps.c
+++ b/arch/m68k/lib/traps.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <init.h>
 #include <watchdog.h>
 #include <command.h>
 #include <asm/processor.h>

diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index b4bcdf81508224fcfb33c351a07777ed2f0e7bef..6fe8ebd16bad08bd84628fc9167fd8303d4313d2 100644 (file)
--- a/arch/mips/lib/traps.c
+++ b/arch/mips/lib/traps.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/system.h>

diff --git a/include/common.h b/include/common.h
index a292d919390231dd9c3ff3e7de298307f3526874..e946e4d9b7fcb6608de740ceb9cf1d16b12829f4 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -145,7 +145,6 @@ void        relocate_code(ulong);
 void   relocate_code(ulong, gd_t *, ulong) __attribute__ ((noreturn));
 #endif
 ulong  get_endaddr   (void);
-void   trap_init     (ulong);
 
 void s_init(void);
 

diff --git a/include/init.h b/include/init.h
index 3b45e631fcaf7c319e9730cdd05e388efb65e8ff..8b65b2afe42fef1d2e3596f807689595ce16363e 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -208,6 +208,8 @@ int board_early_init_r(void);
 /* TODO(sjg@chromium.org): Drop this when DM_PCI migration is completed */
 void pci_init_board(void);
 
+void trap_init(unsigned long reloc_addr);
+
 #endif /* __ASSEMBLY__ */
 /* Put only stuff here that the assembler can digest */