From patchwork Thu May 2 16:05:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 241038 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id F2E4C2C00BC for ; Fri, 3 May 2013 02:05:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 96D214A2BF; Thu, 2 May 2013 18:05:38 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lqg+WqCA49ER; Thu, 2 May 2013 18:05:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9C56F4A2DC; Thu, 2 May 2013 18:05:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F09634A2DC for ; Thu, 2 May 2013 18:05:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OXxoWx5rJX7Z for ; Thu, 2 May 2013 18:05:20 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-yh0-f50.google.com (mail-yh0-f50.google.com [209.85.213.50]) by theia.denx.de (Postfix) with ESMTPS id D67AC4A2DE for ; Thu, 2 May 2013 18:05:12 +0200 (CEST) Received: by mail-yh0-f50.google.com with SMTP id z20so113538yhz.37 for ; Thu, 02 May 2013 09:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :organization:user-agent; bh=Y5Gih0OKALJn0M3MD8U3t9vxZUfyjc58JaZId19PXt8=; b=LNu1gKLHYlLNw0zlQqKQPToTeQUj9NdLBBAOpVbfOp9UOwhS7wQSPUIJeg2MwICGo4 PcmC3yecd+j/NWhNS+PHQwiHENqUPQBKMC3cij/pz/WSlevpKNFV2GTnsStC32VBJqMB KhywPKUTI6+Fx//P6iVn+rEWG4jyRjNxKK+LGwpvRGMYRJRhSTLOiMcT1bPxQO14Z7r0 NL7EQ6rSxeuhcN7dm76i6VrmsBadv5rugoXRImeXeZXJj3Pc16SSVReY4xQgJ5o6s1Sf Guv3jv/MeUlEsjdsYiTYXODjWFQrBZdtEcjg/Pxj0hr3Zw+3iL3dwBx2rpZrSKh7z50o EeKg== X-Received: by 10.236.110.207 with SMTP id u55mr5426845yhg.135.1367510711362; Thu, 02 May 2013 09:05:11 -0700 (PDT) Received: from bill-the-cat (cpe-065-184-250-089.ec.res.rr.com. [65.184.250.89]) by mx.google.com with ESMTPSA id t41sm13896336yhh.11.2013.05.02.09.05.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 02 May 2013 09:05:09 -0700 (PDT) Date: Thu, 2 May 2013 12:05:13 -0400 From: Tom Rini To: Andreas Bie??mann Message-ID: <20130502160513.GB25397@bill-the-cat> References: <1366196568-23008-1-git-send-email-andreas.devel@googlemail.com> <1366361330-13852-1-git-send-email-andreas.devel@googlemail.com> <1366361330-13852-6-git-send-email-andreas.devel@googlemail.com> MIME-Version: 1.0 In-Reply-To: <1366361330-13852-6-git-send-email-andreas.devel@googlemail.com> Organization: Texas Instruments User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Scott McNutt , Kim Phillips , Shinya Kuribayashi , Graeme Russ , Kumar Gala , U-Boot Mailing List , Macpaul Lin , Andy Fleming , Stefan Roese Subject: Re: [U-Boot] [PATCH v3 5/5] lib: consolidate hang() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 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! 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);