Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 78E02C54EBC for ; Tue, 10 Jan 2023 16:21:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 650A4854C2; Tue, 10 Jan 2023 17:20:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="e9J+/NLo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D1208551C; Tue, 10 Jan 2023 17:19:59 +0100 (CET) Received: from mail-yw1-x1131.google.com (mail-yw1-x1131.google.com [IPv6:2607:f8b0:4864:20::1131]) (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 14E9B8539D for ; Tue, 10 Jan 2023 17:19:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-4b718cab0e4so160542917b3.9 for ; Tue, 10 Jan 2023 08:19:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fc+5186Y9j1fEw8+yMV9qRlYIR1wfWkvULWZczrBXdA=; b=e9J+/NLoD8s8A+VLYIw6AX51eAFTZOWfRmY4hAlo0ro0b1ud/1ypqMGklQk9spP8i3 zMvxRLQIW8iW19hwS+6qaNAGg+iyFEoeizjdlGeZL5EK+Jz8gIJ+iO/rzAmDMq/cKmeE VI/oSHXdtPR7WvO3aSXslDPg92nVsGPCM9KRA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fc+5186Y9j1fEw8+yMV9qRlYIR1wfWkvULWZczrBXdA=; b=vhKb3sg211DPu0Jdz+f0nqV91wFQmurcYksIYf5vEuoUnK/Ea9K8OMl4cuHJFr9MV1 pPuPQISfN9IJIEEpknog0R9DrghgbN5N+bGDYJGJTS7Zctp6mDSZQny8GtrpmQny60JS KSx+jFZfAaghueAacNM6caKSQ5SjyCMcsqAFPMY9KmtMEA2mMvkLNq9UXj6cIcak3Oum djTdnw6IJmh6dJbUJWGJMnKYW+DJ2Cd2hAEYmzouHcflPWtNTB6UEVVkkKv+eBKsGIcl wXRuRu2zqQsZo8R632FqU2xn13U/BV/aLqo6TkRO1Q58j+OXaBy1OYSTfrpyqFSQ1Ucd oAbQ== X-Gm-Message-State: AFqh2koutkcbtCckD1ec6gPYKmPKcLmKKXexY/MnojYDxwJTZf+Pmqmb v9uW7B0BCMTsvrhbRn9Vsy+4Q7MxLXWZjXkltIE= X-Google-Smtp-Source: AMrXdXvgCOjpkTPkzBsXIy6X6nZOsf9vD1YuU9rCRp1BIZJBkxQvFakS9TTNzENrGOwafVupPYRS9Q== X-Received: by 2002:a05:690c:d8d:b0:364:1ba1:4bbe with SMTP id da13-20020a05690c0d8d00b003641ba14bbemr26420017ywb.23.1673367592705; Tue, 10 Jan 2023 08:19:52 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-2c2f-ce0f-8dee-7136.res6.spectrum.com. [2603:6081:7b00:6400:2c2f:ce0f:8dee:7136]) by smtp.gmail.com with ESMTPSA id d12-20020a05620a240c00b006fcc3858044sm7557110qkn.86.2023.01.10.08.19.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 08:19:52 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 07/19] autoboot: Rework CONFIG_AUTOBOOT_STOP_STR_* usage Date: Tue, 10 Jan 2023 11:19:34 -0500 Message-Id: <20230110161946.3816866-7-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230110161946.3816866-1-trini@konsulko.com> References: <20230110161946.3816866-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean In order to not define a CONFIG value when the CONFIG_AUTOBOOT_STOP_STR_* functionality is not enabled, rework the assignment of empty and unused (as the code will be discarded under if 0, in the end) values to be AUTOBOOT_STOP_STR_* instead of CONFIG_AUTOBOOT_STOP_STR_*. Signed-off-by: Tom Rini --- common/autoboot.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/common/autoboot.c b/common/autoboot.c index ea44fdf6add9..95a28b2fd83a 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -40,11 +40,15 @@ DECLARE_GLOBAL_DATA_PTR; static int stored_bootdelay; static int menukey; -#if !defined(CONFIG_AUTOBOOT_STOP_STR_CRYPT) -#define CONFIG_AUTOBOOT_STOP_STR_CRYPT "" +#if defined(CONFIG_AUTOBOOT_STOP_STR_CRYPT) +#define AUTOBOOT_STOP_STR_CRYPT CONFIG_AUTOBOOT_STOP_STR_CRYPT +#else +#define AUTOBOOT_STOP_STR_CRYPT "" #endif -#if !defined(CONFIG_AUTOBOOT_STOP_STR_SHA256) -#define CONFIG_AUTOBOOT_STOP_STR_SHA256 "" +#if defined(CONFIG_AUTOBOOT_STOP_STR_SHA256) +#define AUTOBOOT_STOP_STR_SHA256 CONFIG_AUTOBOOT_STOP_STR_SHA256 +#else +#define AUTOBOOT_STOP_STR_SHA256 "" #endif #ifdef CONFIG_AUTOBOOT_USE_MENUKEY @@ -81,7 +85,7 @@ static int passwd_abort_crypt(uint64_t etime) int err; if (IS_ENABLED(CONFIG_AUTOBOOT_STOP_STR_ENABLE) && !crypt_env_str) - crypt_env_str = CONFIG_AUTOBOOT_STOP_STR_CRYPT; + crypt_env_str = AUTOBOOT_STOP_STR_CRYPT; if (!crypt_env_str) return 0; @@ -160,7 +164,7 @@ static int passwd_abort_sha256(uint64_t etime) int ret; if (sha_env_str == NULL) - sha_env_str = CONFIG_AUTOBOOT_STOP_STR_SHA256; + sha_env_str = AUTOBOOT_STOP_STR_SHA256; presskey = malloc_cache_aligned(DELAY_STOP_STR_MAX_LENGTH); c = strstr(sha_env_str, ":"); -- 2.25.1