From patchwork Mon Jun 27 07:23:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 70898 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp932848qgy; Mon, 27 Jun 2016 00:22:57 -0700 (PDT) X-Received: by 10.194.101.233 with SMTP id fj9mr14005755wjb.54.1467012176937; Mon, 27 Jun 2016 00:22:56 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id 128si12281231wmi.28.2016.06.27.00.22.56; Mon, 27 Jun 2016 00:22:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E8E83A7548; Mon, 27 Jun 2016 09:22:48 +0200 (CEST) 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 bEm3a63C4Ngg; Mon, 27 Jun 2016 09:22:48 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9627EA763D; Mon, 27 Jun 2016 09:22:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AFDE6A74D6 for ; Mon, 27 Jun 2016 09:22:32 +0200 (CEST) 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 mqwnrdMf0CCi for ; Mon, 27 Jun 2016 09:22:32 +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 conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by theia.denx.de (Postfix) with ESMTPS id 0C547A7548 for ; Mon, 27 Jun 2016 09:22:30 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id u5R7Lfak007984; Mon, 27 Jun 2016 16:21:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com u5R7Lfak007984 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1467012115; bh=aqoVsaTOXWZHGgYzhJXLCjtmBsNu/e8vdgWAaYKIxQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EKZdsBrxV21psMDF0jSVqc46bT1W9wFofLJg/TdpWhgVlPbHKiIhGx+cUoDnXOxP8 iPpHEHWtBb3axoWvC4heFWJjAyEl4blDWUjwC44WDtEc6C/H7K58tYWs/9syPJOd+m t7oFSXDL3NXzhjOdkXA5xmmbaWDdkGMyGR2Qykq25lypzL1qlrvp82gROgSc+YMkqH v5qSdXxqW0rdg185+0GwFQcVnIghM06ZjhFl4kGVzlXClfWMwjnb9OIEFDmzc73jOz IxjLokksd6uRs1iFbV6qb1m3B32ahovjgOOpoiAmyad8D9UGSXPAczj09XSc35oV80 6bp75L3hRQlPQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 27 Jun 2016 16:23:03 +0900 Message-Id: <1467012184-3231-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467012184-3231-1-git-send-email-yamada.masahiro@socionext.com> References: <1467012184-3231-1-git-send-email-yamada.masahiro@socionext.com> Cc: Stefan Roese Subject: [U-Boot] [PATCH v3 5/6] autoboot: move CONFIG_SILENT_CONSOLE handling X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Factor out the same code from the callees to the caller. Signed-off-by: Masahiro Yamada Reviewed-by: Stefan Roese Reviewed-by: Simon Glass Reviewed-by: Heiko Schocher --- Changes in v3: None Changes in v2: - Fix build error when CONFIG_SILENT_CONSOLE is enabled common/autoboot.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/common/autoboot.c b/common/autoboot.c index eb31c88..fb13139 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -202,11 +202,6 @@ static int __abortboot(int bootdelay) if (!abort) debug_bootkeys("key timeout\n"); -#ifdef CONFIG_SILENT_CONSOLE - if (abort) - gd->flags &= ~GD_FLG_SILENT; -#endif - return abort; } @@ -263,18 +258,22 @@ static int __abortboot(int bootdelay) putc('\n'); -#ifdef CONFIG_SILENT_CONSOLE - if (abort) - gd->flags &= ~GD_FLG_SILENT; -#endif - return abort; } # endif /* CONFIG_AUTOBOOT_KEYED */ static int abortboot(int bootdelay) { - return __abortboot(bootdelay); + int abort; + + abort = __abortboot(bootdelay); + +#ifdef CONFIG_SILENT_CONSOLE + if (abort) + gd->flags &= ~GD_FLG_SILENT; +#endif + + return abort; } static void process_fdt_options(const void *blob)