From patchwork Sun Aug 4 04:29:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul B. Henson" X-Patchwork-Id: 264456 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 B13412C0091 for ; Sun, 4 Aug 2013 14:57:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B32814A019; Sun, 4 Aug 2013 06:57:25 +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 pjMgTpe43ccX; Sun, 4 Aug 2013 06:57:25 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 29D7C4A01B; Sun, 4 Aug 2013 06:57:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A85DB4A01B for ; Sun, 4 Aug 2013 06:57:17 +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 RCmvbkAmO0YR for ; Sun, 4 Aug 2013 06:57:12 +0200 (CEST) X-Greylist: delayed 1087 seconds by postgrey-1.27 at theia; Sun, 04 Aug 2013 06:57:05 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 server.pbhware.com (bart.pbhware.com [96.251.22.154]) by theia.denx.de (Postfix) with ESMTP id 475904A019 for ; Sun, 4 Aug 2013 06:57:05 +0200 (CEST) Received: from zaphod.pbhware.com (zaphod.pbhware.com [10.128.60.31]) by server.pbhware.com (Postfix) with ESMTP id DE5FAE403E for ; Sat, 3 Aug 2013 21:38:56 -0700 (PDT) Received: by zaphod.pbhware.com (Postfix, from userid 1000) id C05C55C0E1; Sat, 3 Aug 2013 21:38:56 -0700 (PDT) From: "Paul B. Henson" To: u-boot@lists.denx.de Date: Sat, 3 Aug 2013 21:29:09 -0700 Message-Id: <20130804043856.C05C55C0E1@zaphod.pbhware.com> Subject: [U-Boot] [PATCH] bootm: fix conditional controlling call to fixup_silent_linux 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This function is only defined if CONFIG_SILENT_CONSOLE is set and CONFIG_SILENT_U_BOOT_ONLY is not set, the call to it should be based on the same conditions. Signed-off-by: Paul B. Henson Acked-by: Simon Glass --- common/cmd_bootm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 046e22f..691d16b 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -636,7 +636,7 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, goto err; else if (ret == BOOTM_ERR_OVERLAP) ret = 0; -#ifdef CONFIG_SILENT_CONSOLE +#if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY) if (images->os.os == IH_OS_LINUX) fixup_silent_linux(); #endif