commit 537ecc918a236b9922c82d8f1c98167a5c2bcfed
author Simon Glass <sjg@chromium.org> Thu Nov 14 12:57:48 2019 -0700
committer Tom Rini <trini@konsulko.com> Mon Dec 02 18:25:25 2019 -0500
tree bcf9a9cd15efea52f169419bf1c1e59f9f7669c9
parent 18afe10f7d6ad67d6fa31b7ae3b04cb5ad546f46

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>

arch/m68k/lib/traps.c

diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c
index 5d80207..2ccd55a 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>

arch/mips/lib/traps.c

diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c
index b4bcdf8..6fe8ebd 100644
--- 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>

include/common.h

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

include/init.h

diff --git a/include/init.h b/include/init.h
index 3b45e63..8b65b2a 100644
--- a/include/init.h
+++ b/include/init.h
@@ -208,6 +208,8 @@
 /* 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 */