From mboxrd@z Thu Jan 1 00:00:00 1970 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 1CAF8C636CC for ; Sun, 5 Feb 2023 22:48:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 758BD85A29; Sun, 5 Feb 2023 23:41:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="TVrP9NB3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27A8B85A03; Sun, 5 Feb 2023 23:40:20 +0100 (CET) Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (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 471A685966 for ; Sun, 5 Feb 2023 23:39:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id n2so657477ili.11 for ; Sun, 05 Feb 2023 14:39:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s9wPOnoO2uHh+IEQt4mPD6mCJqHdr8V07gv4PPmrWQA=; b=TVrP9NB3jfgT558/etEu2ybske836DZ0m1Y0gz3NOlPIw23w0yNcWFquQIDq8BiZGh sTRHno1ZZEiTLufSf5HWZ1B+Yafxq5c5k++gP0wRHv+6uSHsqvIssTcrhTiwizOyubWK wCsXypCUcUNT3amn/cpLOiE1Mjyz9QqggxERY= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s9wPOnoO2uHh+IEQt4mPD6mCJqHdr8V07gv4PPmrWQA=; b=nAiMjWpeG3c10UkATfelFBcuAqTfGbfuO58VFmZcvdBiBXOWFpggtWhQQrX2h59yP8 LhMGAwuRlvG7DxripWkwLsi2elvEkQRCuzcRPvxsrUjMPa9FVvkxNvVCbbIxjFXyAz+H WgGbZq4BFqvB+lXetaYP+U+RuoKPSyYJLejKsU7Ptp3XjpQNK79lLLsRa80evtmdX6IU oX6fmgtW9KH23hc0h9iSgvFW5++if9MwITT7/Rztwux9U9iP7FgjtB+v5SzXiATjSxmo RZk9uJg2gtWA5vQC/y9cUE1oNG2XFB27c9JaYuScegBcWaTrx7sBwKWfktPAxj1Sgxdl bQZg== X-Gm-Message-State: AO0yUKWwfF4vqSp5ymhUKsFLkvEZCBPG/66Ij2GScLWMyX2sJaT1cV0y wd4eGeqh8AZIFU9yNaqZ9w5RD9ja08KJlS+J X-Google-Smtp-Source: AK7set+puLISUjOWYEw6imS84c+D6kQqZ3ARrRzzaebG66HM1ekqzbfUXyQIpT3gEgnqamo73Ic6eg== X-Received: by 2002:a05:6e02:12cb:b0:310:b629:22c with SMTP id i11-20020a056e0212cb00b00310b629022cmr15045708ilm.12.1675636779640; Sun, 05 Feb 2023 14:39:39 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:39 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 056/169] Correct SPL use of CMD_SHA1SUM Date: Sun, 5 Feb 2023 15:36:42 -0700 Message-Id: <20230205223836.231657-57-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-1-sjg@chromium.org> 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 This converts 1 usage of this option to the non-SPL form, since there is no SPL_CMD_SHA1SUM defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) common/hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hash.c b/common/hash.c index 2ce79b9908b..9a52d6073ce 100644 --- a/common/hash.c +++ b/common/hash.c @@ -326,7 +326,7 @@ static struct hash_algo hash_algo[] = { }; /* Try to minimize code size for boards that don't want much hashing */ -#if CONFIG_IS_ENABLED(SHA256) || CONFIG_IS_ENABLED(CMD_SHA1SUM) || \ +#if CONFIG_IS_ENABLED(SHA256) || IS_ENABLED(CONFIG_CMD_SHA1SUM) || \ CONFIG_IS_ENABLED(CRC32_VERIFY) || IS_ENABLED(CONFIG_CMD_HASH) || \ CONFIG_IS_ENABLED(SHA384) || CONFIG_IS_ENABLED(SHA512) #define multi_hash() 1 -- 2.39.1.519.gcb327c4b5f-goog