From 941338725d339c233379def75adeaa0977587a96 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 28 Dec 2019 10:44:45 -0700 Subject: common: Move relocate_code() to init.h This is an init function so move it out of the common header. Avoid using the typedef so that we don't have to include the global_data header file. Also tidy up the function style in comments while we are here. Signed-off-by: Simon Glass --- arch/nios2/cpu/start.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/nios2') diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index 2900200dbb..f5ad184e8d 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -147,7 +147,7 @@ _reloc: * We'll call the board_init_r from here since this isn't * supposed to return. * - * void relocate_code (ulong sp, gd_t *global_data, + * void relocate_code(ulong sp, gd_t *global_data, * ulong reloc_addr) * __attribute__ ((noreturn)); */ -- cgit From db41d65a97f335167e1fbc0400a83333b5157703 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 28 Dec 2019 10:45:07 -0700 Subject: common: Move hang() to the same header as panic() At present panic() is in the vsprintf.h header file. That does not seem like an obvious choice for hang(), even though it relates to panic(). So let's put hang() in its own header. Signed-off-by: Simon Glass [trini: Migrate a few more files] Signed-off-by: Tom Rini --- arch/nios2/cpu/traps.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/nios2') diff --git a/arch/nios2/cpu/traps.c b/arch/nios2/cpu/traps.c index 1c3cc03178..087a05097d 100644 --- a/arch/nios2/cpu/traps.c +++ b/arch/nios2/cpu/traps.c @@ -4,8 +4,9 @@ * Scott McNutt */ -#include #include +#include +#include void trap_handler (struct pt_regs *regs) { @@ -21,5 +22,5 @@ void soft_emulation (struct pt_regs *regs) */ printf ("\n\n*** ERROR: unimplemented instruction @ %08x\n", regs->reg[29] - 4); - hang (); + hang(); } -- cgit