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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92EC7C47E48 for ; Wed, 14 Jul 2021 22:09:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 17485613C2 for ; Wed, 14 Jul 2021 22:09:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17485613C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 55D8F82BFA; Thu, 15 Jul 2021 00:08:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W+EdyOmq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40F898164D; Thu, 15 Jul 2021 00:06:25 +0200 (CEST) Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) (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 4F99A82992 for ; Thu, 15 Jul 2021 00:06:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mr.nuke.me@gmail.com Received: by mail-ot1-x32b.google.com with SMTP id 42-20020a9d012d0000b02904b98d90c82cso4106810otu.5 for ; Wed, 14 Jul 2021 15:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rGNkNwU810i4bQOYHGOi8JExB4qTj3cTHP6jcRT/iNc=; b=W+EdyOmqdwV01VNWEiMIYfxx3cHIgOwq3PjBeIkFCTDrGgxadc4XOgb/BW999vj4L/ 4lp9990zN2soAP1nEaT1kw8NDVZ9Cp95AzPCt2tVVkB9fI51aFvdu7qUmib0Qy7g5vtq P2n/e5mwkfGRuPTo/nKSioJqs/uS1o88Xd4+eidm903rTSo1qbTdStXsqs3yHWqV9NRa efIr9cWSpc8Wft+qE4ItV/MGKX4dC0+pti5M1Fi/AU9vy6vB2tDWXmjVSrz6oUMOCiH7 1C7eHABFWSXmibkht6iPu3RO6SyCQ/p1wu3z6Rl6poD5c9hCWQhjY5OHUflXd9WmnOFJ kvgA== 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=rGNkNwU810i4bQOYHGOi8JExB4qTj3cTHP6jcRT/iNc=; b=Iks3Zs6zlp2jiB7g85l0KOoNVOjy3qC1ibConl7ulHNrVJ9/9AbKSGBLtJZFTanScp cnZ8QlJx2/mOBu9hTFwfz1RE4eF1t75e9nyN6ZoPzoT6zcsCwl4LO15DF2jlGZUoqHdN b3u5Y+BpECPQnUTOe8YBLqqd52dXkVwhjMVWdJLVl5X6TyW5y6YB0MZxyp4XwYbpGb29 9gM0eICAPQwLtiJsfzDCSbvIfmsepZxhBlo2krBVWDzS0+QSyl43CqYsIXK3ia4vzmu7 UcJysYeHssQkI3ITBRW5ecaL0fmPaZ6e4d0P6gi/Hzpw60cLXhTo0GR1nevvWt98jEWh jEuA== X-Gm-Message-State: AOAM53139ovVwR2r0CNTlgLUctSZ21xFuEoyLt60Q7rmRckRZKIwT5mF VgRx+E09wN2SO67Tq+/IX2udvg7yhi4= X-Google-Smtp-Source: ABdhPJyXyJEksTZ0r9FhaOIygXc1FCgC+YUgDxkfNV/KBX/2cwZqlGHKadFzvxUG/xRsSeDn9RgNTw== X-Received: by 2002:a9d:2f0:: with SMTP id 103mr295263otl.174.1626300367448; Wed, 14 Jul 2021 15:06:07 -0700 (PDT) Received: from nuclearis3.lan (c-98-195-139-126.hsd1.tx.comcast.net. [98.195.139.126]) by smtp.gmail.com with ESMTPSA id w64sm687278otb.45.2021.07.14.15.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 15:06:07 -0700 (PDT) From: Alexandru Gagniuc To: u-boot@lists.denx.de, trini@konsulko.com Cc: Alexandru Gagniuc , Simon Glass Subject: [PATCH v3 16/19] image: Eliminate IMAGE_ENABLE_VERIFY macro Date: Wed, 14 Jul 2021 17:05:44 -0500 Message-Id: <20210714220547.170371-17-mr.nuke.me@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210714211138.GA25256@bill-the-cat> References: <20210714211138.GA25256@bill-the-cat> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 This macro is no longer needed for code flow or #ifdefs. Remove it. Signed-off-by: Alexandru Gagniuc Reviewed-by: Simon Glass --- include/image.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/image.h b/include/image.h index d4c453428c..64663c591b 100644 --- a/include/image.h +++ b/include/image.h @@ -1196,19 +1196,16 @@ int calculate_hash(const void *data, int data_len, const char *algo, #if defined(USE_HOSTCC) # if defined(CONFIG_FIT_SIGNATURE) # define IMAGE_ENABLE_SIGN 1 -# define IMAGE_ENABLE_VERIFY 1 # define IMAGE_ENABLE_VERIFY_ECDSA 1 # define FIT_IMAGE_ENABLE_VERIFY 1 # include # else # define IMAGE_ENABLE_SIGN 0 -# define IMAGE_ENABLE_VERIFY 0 # define IMAGE_ENABLE_VERIFY_ECDSA 0 # define FIT_IMAGE_ENABLE_VERIFY 0 # endif #else # define IMAGE_ENABLE_SIGN 0 -# define IMAGE_ENABLE_VERIFY CONFIG_IS_ENABLED(RSA_VERIFY) # define IMAGE_ENABLE_VERIFY_ECDSA 0 # define FIT_IMAGE_ENABLE_VERIFY CONFIG_IS_ENABLED(FIT_SIGNATURE) #endif @@ -1260,7 +1257,7 @@ struct image_region { int size; }; -#if IMAGE_ENABLE_VERIFY +#if FIT_IMAGE_ENABLE_VERIFY # include #endif struct checksum_algo { -- 2.31.1