redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

lib: consolidate hang() 

Delete all occurrences of hang() and provide a generic function.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
[trini: Modify check around puts() in hang.c slightly]
Signed-off-by: Tom Rini <trini@ti.com>
utp
Andreas Bießmann 2013-04-18 22:48:50 +00:00 committed by Tom Rini
parent b0dac5b1af
commit d2eae43ba8
20 changed files with 48 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/cpu/arm926ejs/mxs/spl_boot.c
View File

@ -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 (;;)
;
}

7
arch/arm/cpu/arm926ejs/spear/spl.c
View File

@ -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;

6
arch/arm/lib/board.c
View File

@ -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 (;;);
}

5
arch/avr32/lib/board.c
View File

@ -120,11 +120,6 @@ static int display_banner (void)
return 0;
}
void hang(void)
{
for (;;) ;
}
static int display_dram_config (void)
{
int i;

14
arch/blackfin/lib/board.c
View File

@ -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;");
}

7
arch/m68k/lib/board.c
View File

@ -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 (;;);
}

7
arch/microblaze/lib/board.c
View File

@ -195,10 +195,3 @@ void board_init_f(ulong not_used)
main_loop();
}
}
void hang(void)
{
puts("### ERROR ### Please RESET the board ###\n");
for (;;)
;
}

7
arch/mips/lib/board.c
View File

@ -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 (;;)
;
}

7
arch/nds32/lib/board.c
View File

@ -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 (;;)
;
}

11
arch/nios2/lib/board.c
View File

@ -162,14 +162,3 @@ void board_init(void)
main_loop();
}
}
/***********************************************************************/
void hang(void)
{
disable_interrupts();
puts("### ERROR ### Please reset board ###\n");
for (;;)
;
}

12
arch/openrisc/lib/board.c
View File

@ -154,15 +154,3 @@ void board_init(void)
main_loop();
}
}
/***********************************************************************/
void hang(void)
{
disable_interrupts();
puts("### ERROR ### Please reset board ###\n");
for (;;)
;
}

9
arch/powerpc/lib/board.c
View File

@ -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

9
arch/sh/lib/board.c
View File

@ -200,12 +200,3 @@ void sh_generic_init(void)
main_loop();
}
}
/***********************************************************************/
void hang(void)
{
puts("Board ERROR\n");
for (;;)
;
}

9
arch/sparc/lib/board.c
View File

@ -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 (;;) ;
}
/************************************************************************/

7
arch/x86/lib/board.c
View File

@ -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 (;;)
;
}

10
common/board_f.c
View File

@ -1087,13 +1087,3 @@ void board_init_f_r(void)
hang();
}
#endif /* CONFIG_X86 */
void hang(void)
{
puts("### ERROR ### Please RESET the board ###\n");
#ifdef CONFIG_SANDBOX
os_exit(0);
#else
for (;;);
#endif
}

7
common/spl/spl.c
View File

@ -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.

9
drivers/mtd/nand/mxc_nand_spl.c
View File

@ -355,12 +355,3 @@ void nand_boot(void)
hang();
}
}
/*
* Called in case of an exception.
*/
void hang(void)
{
/* Loop forever */
while (1) ;
}

1
lib/Makefile
View File

@ -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-$(CONFIG_REGEX) += slre.o
COBJS-y += string.o

47
lib/hang.c 100644
View File

@ -0,0 +1,47 @@
/*
* (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) && \
defined(CONFIG_SPL_SERIAL_SUPPORT))
puts("### ERROR ### Please RESET the board ###\n");
#endif
bootstage_error(BOOTSTAGE_ID_NEED_RESET);
for (;;)
;
}