From patchwork Tue Jun 22 02:39:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Da Xue X-Patchwork-Id: 1495426 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=libre.computer header.i=@libre.computer header.a=rsa-sha256 header.s=google header.b=CPsBPxqN; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G89bW2lLCz9sWD for ; Tue, 22 Jun 2021 12:39:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9621081D95; Tue, 22 Jun 2021 04:39:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=libre.computer Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=libre.computer header.i=@libre.computer header.b="CPsBPxqN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2E17E8293C; Tue, 22 Jun 2021 04:39:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HTML_MESSAGE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EDC4580EC6 for ; Tue, 22 Jun 2021 04:39:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=libre.computer Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=da@lessconfused.com Received: by mail-lj1-x22b.google.com with SMTP id z22so27930897ljh.8 for ; Mon, 21 Jun 2021 19:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libre.computer; s=google; h=mime-version:from:date:message-id:subject:to:cc; bh=e0VcHIWoLlYcsGQxzhf+/70XAj5FU33dNzRR+yK7JKU=; b=CPsBPxqNd3YanFd758omTEBwNVtxuj/0ofdAaR55HnfG1Fp+ovP92yDznSLyshc+u6 0428qZdWUxnh3F1nyEE2W36FgTAvXSPFbWbHMpl6vlehQrOt5omJhgJoDTB7wjgs/vju hn28b6UdtjNAZ+0jvNNtL54uRKoOvlZbncUH4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=e0VcHIWoLlYcsGQxzhf+/70XAj5FU33dNzRR+yK7JKU=; b=nyhV7XmVa255eifhk4AUbAgFDdT16vNi+74chtxBn7Fxai1lRZO0i68LfoEhOpMo+x kcYiInuQG69aZCksJLHJ4skmrZkCjOfzJePX6R3W9Df6WlXSGWaTF+bbMEIRVfBKGORS dOegT18kNfi+OPxmySj0JKlmc8rYTH9I23X00Th09iAr2w7F3F2gJFiCoxfgDeuj//Q1 WkGE2GZYuwH30HYfZ8iXxj1Jg30QSmtRNRI3EwicRnnfHzV2tkJgkx3YYSoEFjKmqJ0C ZUaClALu91e7VGtlZ7V99FK8XuOG/GW56glqAiBaDRbC2CtCJy42uZDea6BAW8N1gDIU 3q+A== X-Gm-Message-State: AOAM5330TlufqiL1DWeutYj/PgDzZgPS2Urj2YZ+wIMOnYlAgR1vFsf9 LnY+zJyLsaC7nn/yRXmdPUOlev+xGtfYc1CGJnl7W1VLF3duw9ox X-Google-Smtp-Source: ABdhPJxno42tc+Vk5Ihzn2FTsPSKVx1eIfqW32ohDoqTYlZzDBC6Yyr5xfH/csS0KyVE2PlNC1g13DKfT49AWpfku9U= X-Received: by 2002:a2e:9251:: with SMTP id v17mr1085424ljg.193.1624329570820; Mon, 21 Jun 2021 19:39:30 -0700 (PDT) MIME-Version: 1.0 From: Da Xue Date: Mon, 21 Jun 2021 22:39:19 -0400 Message-ID: Subject: [PATCH] autoboot: fix typos of CONFIG_AUTOBOOT_USE_MENUKEY To: U-Boot Mailing List Cc: Simon Glass , Tom Rini , Martin Etnestad X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean replace typo CONFIG_USE_AUTOBOOT_MENUKEY with CONFIG_AUTOBOOT_USE_MENUKEY Signed-off-by: Da Xue --- common/autoboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) #endif @@ -282,7 +282,7 @@ static int abortboot_single_key(int bootdelay) abort = 1; /* don't auto boot */ bootdelay = 0; /* no more delay */ key = getchar();/* consume input */ - if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY)) + if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY)) menukey = key; break; } @@ -388,7 +388,7 @@ void autoboot_command(const char *s) disable_ctrlc(prev); /* restore Ctrl-C checking */ } - if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) && + if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY) && menukey == AUTOBOOT_MENUKEY) { s = env_get("menucmd"); if (s) -- 2.20.1 diff --git a/common/autoboot.c b/common/autoboot.c index 0bb08e7a4c..e201c01ece 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -44,8 +44,8 @@ static int menukey; #define AUTOBOOT_STOP_STR_SHA256 "" #endif -#ifdef CONFIG_USE_AUTOBOOT_MENUKEY -#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY +#if defined(CONFIG_AUTOBOOT_USE_MENUKEY) && defined(CONFIG_AUTOBOOT_MENUKEY) +#define AUTOBOOT_MENUKEY CONFIG_AUTOBOOT_MENUKEY #else #define AUTOBOOT_MENUKEY 0