diff options
| author | Simon Glass <sjg@chromium.org> | 2019-11-14 12:57:48 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-02 18:25:25 -0500 |
| commit | d67bdaa7999944001391fc238f00dfbaf7e9929a (patch) | |
| tree | bcf9a9cd15efea52f169419bf1c1e59f9f7669c9 | |
| parent | 2cf431c228776d9899dfb980086b86d4dd3b2473 (diff) | |
| download | u-boot-d67bdaa7999944001391fc238f00dfbaf7e9929a.tar.gz | |
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>
| -rw-r--r-- | arch/m68k/lib/traps.c | 1 | ||||
| -rw-r--r-- | arch/mips/lib/traps.c | 1 | ||||
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/init.h | 2 |
4 files changed, 4 insertions, 1 deletions
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 b4bcdf8150..6fe8ebd16b 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> 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 */ |