summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2013-04-18 22:48:50 +0000
committerTom Rini <trini@ti.com>2013-05-01 16:41:08 -0400
commitd2eae43ba803cff75b44a07d08d718ecdecdee94 (patch)
tree204a8f6910b96fe92724b4a03043864f6f0da798 /common
parentb0dac5b1af6a66aeb02eb63e852415367b30b168 (diff)
downloadu-boot-imx-d2eae43ba803cff75b44a07d08d718ecdecdee94.zip
u-boot-imx-d2eae43ba803cff75b44a07d08d718ecdecdee94.tar.gz
u-boot-imx-d2eae43ba803cff75b44a07d08d718ecdecdee94.tar.bz2
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>
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c10
-rw-r--r--common/spl/spl.c7
2 files changed, 0 insertions, 17 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 3a6638f..32e59fa 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -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
-}
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.