From patchwork Thu Apr 26 13:57:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Eibach X-Patchwork-Id: 155280 X-Patchwork-Delegate: wd@denx.de 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 E6C70B6FA1 for ; Thu, 26 Apr 2012 23:53:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C803D2848E; Thu, 26 Apr 2012 15:52:44 +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 K3QMX84LS2FI; Thu, 26 Apr 2012 15:52:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1378C2846A; Thu, 26 Apr 2012 15:52:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0B30B28482 for ; Thu, 26 Apr 2012 15:52:35 +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 K24vy5Rr-ISJ for ; Thu, 26 Apr 2012 15:52:23 +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 sputnik.urmx.de (sputnik.urmx.de [88.198.51.18]) by theia.denx.de (Postfix) with ESMTP id 1260228137 for ; Thu, 26 Apr 2012 15:52:22 +0200 (CEST) Received: from mailrelay.gdsys.de (unknown [217.6.197.20]) by sputnik.urmx.de (Postfix) with ESMTP id 467996020FCF for ; Thu, 26 Apr 2012 15:52:21 +0200 (CEST) Received: from mailsgw.gdsys.de (localhost [127.0.0.1]) by mailsgw.gdsys.de (Postfix) with ESMTP id 13A081F8801 for ; Thu, 26 Apr 2012 15:52:22 +0200 (CEST) From: Dirk Eibach To: u-boot@lists.denx.de Date: Thu, 26 Apr 2012 15:57:05 +0200 Message-Id: <1335448625-21180-2-git-send-email-eibach@gdsys.de> In-Reply-To: <1335448625-21180-1-git-send-email-eibach@gdsys.de> References: <1335448625-21180-1-git-send-email-eibach@gdsys.de> X-SafeGuard_MailGateway: Version: 5.60.3.11066 SGMG Date: 20120426135222Z X-AntiVirus: checked by AntiVir MailGate (version: 2.0.2-5; AVE: 7.9.10.52; VDF: 7.11.28.190; host: mailrelay) Subject: [U-Boot] [PATCH v2] Consider CONFIG_ZERO_BOOTDELAY_CHECK when CONFIG_AUTOBOOT_KEYED is set 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 When CONFIG_ZERO_BOOTDELAY_CHECK is not defined, bootdelay==0 prevents the check for console input (as stated in README.autoboot). This must also work in CONFIG_AUTOBOOT_KEYED mode. Signed-off-by: Dirk Eibach --- Changes in v2: - split up original patch series common/main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/common/main.c b/common/main.c index 3b9e39a..b40f96e 100644 --- a/common/main.c +++ b/common/main.c @@ -113,6 +113,11 @@ int abortboot(int bootdelay) u_int presskey_max = 0; u_int i; +#ifndef CONFIG_ZERO_BOOTDELAY_CHECK + if (bootdelay == 0) + return 0; +#endif + # ifdef CONFIG_AUTOBOOT_PROMPT printf(CONFIG_AUTOBOOT_PROMPT); # endif