Hi Andreas,
On Fri, 19 Apr 2013 10:48:50 +0200, Andreas Bießmann andreas.devel@googlemail.com wrote:
Delete all occurrences of hang() and provide a generic function.
Signed-off-by: Andreas Bießmann andreas.devel@googlemail.com
Changes in v3:
- remove unnecessarily added linux/compiler.h
- fix typo in new hang() docu
- use simplified macro for SPL_LIBCOMMON_SUPPORT as suggested by Benoît
Changes in v2:
- delete all hang() and provide generic lib/hang.c
arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 7 ----- arch/arm/cpu/arm926ejs/spear/spl.c | 7 ----- arch/arm/lib/board.c | 6 ----- arch/avr32/lib/board.c | 5 ---- arch/blackfin/lib/board.c | 14 ---------- arch/m68k/lib/board.c | 7 ----- arch/microblaze/lib/board.c | 7 ----- arch/mips/lib/board.c | 7 ----- arch/nds32/lib/board.c | 7 ----- arch/nios2/lib/board.c | 11 -------- arch/openrisc/lib/board.c | 12 --------- arch/powerpc/lib/board.c | 9 ------- arch/sandbox/lib/board.c | 7 ----- arch/sh/lib/board.c | 9 ------- arch/sparc/lib/board.c | 9 ------- arch/x86/lib/board.c | 7 ----- common/board_f.c | 6 ----- common/spl/spl.c | 7 ----- drivers/mtd/nand/mxc_nand_spl.c | 9 ------- lib/Makefile | 1 + lib/hang.c | 46 +++++++++++++++++++++++++++++++++ 21 files changed, 47 insertions(+), 153 deletions(-) create mode 100644 lib/hang.c
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index 7e70440..ed525e5 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -148,10 +148,3 @@ inline void board_init_r(gd_t *id, ulong dest_addr) for (;;) ; }
-void hang(void) __attribute__ ((noreturn)); -void hang(void) -{
- for (;;)
;-} diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c index 48e6efb..0101c5d 100644 --- a/arch/arm/cpu/arm926ejs/spear/spl.c +++ b/arch/arm/cpu/arm926ejs/spear/spl.c @@ -31,13 +31,6 @@ #include <asm/arch/spr_misc.h> #include <asm/arch/spr_syscntl.h>
-inline void hang(void) -{
- serial_puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
;-}
static void ddr_clock_init(void) { struct misc_regs *misc_p = (struct misc_regs *)CONFIG_SPEAR_MISCBASE; diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 0521178..09ab4ad 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -706,9 +706,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* NOTREACHED - no way out of command loop except booting */ }
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;);
-} diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index 57e07df..ccf862a 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -120,11 +120,6 @@ static int display_banner (void) return 0; }
-void hang(void) -{
- for (;;) ;
-}
static int display_dram_config (void) { int i; diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 75b6c46..ccea3b9 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -432,17 +432,3 @@ void board_init_r(gd_t * id, ulong dest_addr) for (;;) main_loop(); }
-void hang(void) -{ -#ifdef CONFIG_STATUS_LED
- status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF);
- status_led_set(STATUS_LED_CRASH, STATUS_LED_BLINKING);
-#endif
- puts("### ERROR ### Please RESET the board ###\n");
- while (1)
/* If a JTAG emulator is hooked up, we'll automatically trigger* a breakpoint in it. If one isn't, this is just a NOP.*/asm("emuexcpt;");-} diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index adaccfe..b2e3068 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -663,10 +663,3 @@ void board_init_r (gd_t *id, ulong dest_addr)
/* NOTREACHED - no way out of command loop except booting */ }
-void hang(void) -{
- puts ("### ERROR ### Please RESET the board ###\n");
- for (;;);
-} diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 4c4f36b..f0987ad 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -192,10 +192,3 @@ void board_init_f(ulong not_used) main_loop(); } }
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
;-} diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index f19f198..fac7915 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -344,10 +344,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* NOTREACHED - no way out of command loop except booting */ }
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
;-} diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c index a7d27fc..57af1be 100644 --- a/arch/nds32/lib/board.c +++ b/arch/nds32/lib/board.c @@ -404,10 +404,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* NOTREACHED - no way out of command loop except booting */ }
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
;-} diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c index 0f2bc7e..f430ef0 100644 --- a/arch/nios2/lib/board.c +++ b/arch/nios2/lib/board.c @@ -162,14 +162,3 @@ void board_init(void) main_loop(); } }
-/***********************************************************************/
-void hang(void) -{
- disable_interrupts();
- puts("### ERROR ### Please reset board ###\n");
- for (;;)
;-} diff --git a/arch/openrisc/lib/board.c b/arch/openrisc/lib/board.c index 85aa189..630e45f 100644 --- a/arch/openrisc/lib/board.c +++ b/arch/openrisc/lib/board.c @@ -154,15 +154,3 @@ void board_init(void) main_loop(); } }
-/***********************************************************************/
-void hang(void) -{
- disable_interrupts();
- puts("### ERROR ### Please reset board ###\n");
- for (;;)
;-} diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 422b4a3..41b2294 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -1050,15 +1050,6 @@ void board_init_r(gd_t *id, ulong dest_addr) /* NOTREACHED - no way out of command loop except booting */ }
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- bootstage_error(BOOTSTAGE_ID_NEED_RESET);
- for (;;)
;-}
#if 0 /* We could use plain global data, but the resulting code is bigger */ /*
- Pointer to initial global data area
diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c index 3752fab..50ec7f9 100644 --- a/arch/sandbox/lib/board.c +++ b/arch/sandbox/lib/board.c @@ -276,10 +276,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* NOTREACHED - no way out of command loop except booting */ }
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
;-} diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index 6e43acf..0789ed0 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -200,12 +200,3 @@ void sh_generic_init(void) main_loop(); } }
-/***********************************************************************/
-void hang(void) -{
- puts("Board ERROR\n");
- for (;;)
;-} diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c index 79fb4c8..fbc535f 100644 --- a/arch/sparc/lib/board.c +++ b/arch/sparc/lib/board.c @@ -411,13 +411,4 @@ void board_init_f(ulong bootflag)
}
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
- bootstage_error(BOOTSTAGE_ID_NEED_RESET);
-#endif
- for (;;) ;
-}
/************************************************************************/ diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index f372898..228c2c8 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -264,10 +264,3 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* NOTREACHED - no way out of command loop except booting */ }
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
;-} diff --git a/common/board_f.c b/common/board_f.c index 00ca811..7eaf6b9 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -1003,9 +1003,3 @@ void board_init_f_r(void) hang(); } #endif /* CONFIG_X86 */
-void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;);
-} diff --git a/common/spl/spl.c b/common/spl/spl.c index 6715e0d..7ce2d5f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -48,13 +48,6 @@ struct spl_image_info spl_image; /* Define board data structure */ static bd_t bdata __attribute__ ((section(".data")));
-inline void hang(void) -{
- puts("### ERROR ### Please RESET the board ###\n");
- for (;;)
;-}
/*
- Default function to determine if u-boot or the OS should
- be started. This implementation always returns 1.
diff --git a/drivers/mtd/nand/mxc_nand_spl.c b/drivers/mtd/nand/mxc_nand_spl.c index 09f23c3..edc589e 100644 --- a/drivers/mtd/nand/mxc_nand_spl.c +++ b/drivers/mtd/nand/mxc_nand_spl.c @@ -355,12 +355,3 @@ void nand_boot(void) hang(); } }
-/*
- Called in case of an exception.
- */
-void hang(void) -{
- /* Loop forever */
- while (1) ;
-} diff --git a/lib/Makefile b/lib/Makefile index e901cc7..655ed7f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -71,6 +71,7 @@ COBJS-$(CONFIG_BCH) += bch.o COBJS-y += crc32.o COBJS-y += ctype.o COBJS-y += div64.o +COBJS-y += hang.o COBJS-y += linux_string.o COBJS-y += string.o COBJS-y += time.o diff --git a/lib/hang.c b/lib/hang.c new file mode 100644 index 0000000..ef82f7f --- /dev/null +++ b/lib/hang.c @@ -0,0 +1,46 @@ +/*
- (C) Copyright 2013
- Andreas Bießmann andreas.devel@googlemail.com
- This file consolidates all the different hang() functions implemented in
- u-boot.
- See file CREDITS for list of people who contributed to this
- project.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
- */
+#include <common.h> +#include <bootstage.h>
+/**
- hang - stop processing by staying in an endless loop
- The purpose of this function is to stop further execution of code cause
- something went completely wrong. To catch this and give some feedback to
- the user one needs to catch the bootstage_error (see show_boot_progress())
- in the board code.
- */
+void hang(void) +{ +#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
- puts("### ERROR ### Please RESET the board ###\n");
+#endif
- bootstage_error(BOOTSTAGE_ID_NEED_RESET);
- for (;;)
;+}
For ARM:
Acked-by: Albert ARIBAUD albert.u.boot@aribaud.net
Amicalement,