Message ID | 20190721025128.30351-9-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 42b4d14e34322cba4f4c855fff43688a89c0fbeb |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fE5/Bn1g"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45rqxd0T8vz9sML for <incoming@patchwork.ozlabs.org>; Sun, 21 Jul 2019 13:30:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 58C66C21FA0; Sun, 21 Jul 2019 03:30:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 972E4C21E2C; Sun, 21 Jul 2019 02:54:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8FA76C21E2B; Sun, 21 Jul 2019 02:54:17 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 3D409C21D72 for <u-boot@lists.denx.de>; Sun, 21 Jul 2019 02:52:17 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id g20so66514159ioc.12 for <u-boot@lists.denx.de>; Sat, 20 Jul 2019 19:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jcN+gDd3E88uOUKtFXDwmGw107a6pMWR6oN9UBczDyI=; b=fE5/Bn1gFt+Bk6wjlQLyZgvGZL2z6Piooeugl4qqESi6Kn3wQuI+qCdQfubSGvZH0R KqoxTymXVKe288CQWNM98Z7L2pKI5qaQh6RQxB4bMz2s737eOr0RHkvnPBS7VE/rYNkJ lYq9McvC2i7OsyagHNMgycwxoKatlibUgGfwk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jcN+gDd3E88uOUKtFXDwmGw107a6pMWR6oN9UBczDyI=; b=CW70TOk2SdQkhMkKPPL3Khhuqq9Lir32+hE9GVjIwQ/12thZdAbuFvVDdNzLAOn9nH nVK91KcciSux0panixtqJ7EwHPtDvvFKaMafKkQAfoRtWWbq/5+O5lhSpYYXKofHD0KD FkOfUvIq5YgRUsv/t/biHR9WZf6+ohU+fn8/fosnQ2W/rLHo8rSr6K0i5mRyGgNdu7eT sNrL7+Z2F040Tged/Clc46K1RwDFvFP6tCjUC5ZWxYuThURZ6toxEls23V+Oox0HYWY+ pOouecZtGFdgKAG5QAw6VoJZutd3k5kXkig/YvSpKftt69GQDrkpprjt5g/xji6zXSEh +Whg== X-Gm-Message-State: APjAAAVwEka4jWv38gQRImSxT2RFfcK3jnHCTsbjn928njPmZI6qy2GO L2MyJvHqBL4sxUU7hYpD0sGX/P8jcoI= X-Google-Smtp-Source: APXvYqzAy4twx84lcKWT5dIoaGpdVTfh6ZqscheiK8/YkdghsrkMYLyM7tjOWPr92n6ozI1ytVWB9g== X-Received: by 2002:a02:1c0a:: with SMTP id c10mr66630399jac.69.1563677536130; Sat, 20 Jul 2019 19:52:16 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id b14sm38862696iod.33.2019.07.20.19.52.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Jul 2019 19:52:15 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Sat, 20 Jul 2019 20:51:18 -0600 Message-Id: <20190721025128.30351-9-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.657.g960e92d24f-goog In-Reply-To: <20190721025128.30351-1-sjg@chromium.org> References: <20190721025128.30351-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini <trini@konsulko.com>, Martin Etnestad <martin.etnestad@appeartv.com> Subject: [U-Boot] [PATCH v2 08/18] autoboot: Use if() for CONFIG_SILENT_CONSOLE X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
autoboot: Tidy up autoboot code
|
expand
|
diff --git a/common/autoboot.c b/common/autoboot.c index f832808b71..45df665676 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -286,10 +286,8 @@ static int abortboot(int bootdelay) if (bootdelay >= 0) abort = __abortboot(bootdelay); -#ifdef CONFIG_SILENT_CONSOLE - if (abort) + if (IS_ENABLED(CONFIG_SILENT_CONSOLE) && abort) gd->flags &= ~GD_FLG_SILENT; -#endif return abort; }
Avoid an #ifdef in this function, to improve readability. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None common/autoboot.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)