Move this function into the init.h header file.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: - Add init.h header
Changes in v2: - Move trap_init() into init.h instead; update commit message
arch/m68k/lib/traps.c | 1 + arch/mips/lib/traps.c | 1 + include/common.h | 1 - include/init.h | 2 ++ 4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 5d80207745..2ccd55add0 100644 --- 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 ff02d437a8..944fa60240 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -12,6 +12,7 @@
#include <common.h> #include <cpu_legacy.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 a292d91939..e946e4d9b7 100644 --- 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 3b45e631fc..8b65b2afe4 100644 --- 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 */