Patchwork [U-Boot,v3,5/5] lib: consolidate hang()

login
register
mail settings
Submitter Tom Rini
Date May 2, 2013, 4:05 p.m.
Message ID <20130502160513.GB25397@bill-the-cat>
Download mbox | patch
Permalink /patch/241038/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - May 2, 2013, 4:05 p.m.
On Fri, Apr 19, 2013 at 10:48:50AM +0200, Andreas Bie??mann wrote:

> Delete all occurrences of hang() and provide a generic function.
> 
> Signed-off-by: Andreas Bie??mann <andreas.devel@googlemail.com>

With the following:


To fix build breakage when LIBCOMMON is set, but SERIAL is not and thus
we had a build failure, applied to u-boot/master, thanks!

Patch

diff --git a/lib/hang.c b/lib/hang.c
index ef82f7f..fc1286c 100644
--- a/lib/hang.c
+++ b/lib/hang.c
@@ -37,7 +37,8 @@ 
  */
 void hang(void)
 {
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
+#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);