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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E507C433F5 for ; Sun, 26 Sep 2021 01:47:35 +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 024FE61090 for ; Sun, 26 Sep 2021 01:47:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 024FE61090 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36B9D8360A; Sun, 26 Sep 2021 03:46:52 +0200 (CEST) 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="DSGBjvm0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2C3C083276; Sun, 26 Sep 2021 03:44:44 +0200 (CEST) Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) (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 5D7A283578 for ; Sun, 26 Sep 2021 03:44:06 +0200 (CEST) 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-oi1-x229.google.com with SMTP id s69so20212928oie.13 for ; Sat, 25 Sep 2021 18:44:06 -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=dgZvVsi3SCvI8WqIINqtFzg7xJs161h0YXM6pthQXAI=; b=DSGBjvm0igOLHtxcje+WuRmR0d/rxusAOKjDTds/g7NFFoGbGe9ImHjl/yiN8V+6RI hlVGM9XE1vA0+mDvOUzoCprseDDpCSIcDWiLt3dLJDYN40OBgsL5zX1BGBL4FWfm3we9 i1PaxRplC9RraTXjcRKGWJZ/YNcBmZQK1xhME= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dgZvVsi3SCvI8WqIINqtFzg7xJs161h0YXM6pthQXAI=; b=cLLt/AQ36TpOyhxxC0rCxaVW3TjDwsMYRBbI2M2vosKZaglc5LA/6ipIK8taest4In PeijGUKui0YNuBMjPM0BHfgkscf4/pJodiTjgtqglNaiHIpppmxIU59pFy1QgSWq9prd eZM1T5IxJ3rjTBJLP3oB9Fq9ZE1aPbQWzyYXnyXpefuvS1deY4J9VYE+NL2oxQt6a/WI rkw2yM6kWutpUYNY10zRDNUu6dCR+NtNnl5ql4L+Djbi4Vg64J4mwrPZQlpWFCig5ALN 89fhAdCU/1A2kdQaxCljGkBlk0UF60SqldhILLXDvHoIcDo7wd7RAeKVuzOwHZg0rbqe Cu7g== X-Gm-Message-State: AOAM530t4RfvWRJM83+UK9yzv51avcEbDI8qvGXAq546+SctGkp+YJlJ d02vidwH/rVGvhnYDTVHMUqFvjZUXwvZIQ== X-Google-Smtp-Source: ABdhPJwgZZBp7W2r2xlBt30U+ZW+cWejkBCezLmfa094nhv63rSMoz4Nz4qsMDHtza2JxZM5jvYqOA== X-Received: by 2002:a05:6808:aaa:: with SMTP id r10mr7150215oij.75.1632620644896; Sat, 25 Sep 2021 18:44:04 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id c18sm330378otr.72.2021.09.25.18.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 18:44:04 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Alexandru Gagniuc , Andre Przywara , Rasmus Villemoes , Robert Marko , Masahiro Yamada , Tom Rini , Simon Glass , Joe Hershberger , Marek Vasut Subject: [PATCH v5 15/29] image: Drop IMAGE_ENABLE_IGNORE Date: Sat, 25 Sep 2021 19:43:28 -0600 Message-Id: <20210926014342.127913-9-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210926014342.127913-1-sjg@chromium.org> References: <20210926014342.127913-1-sjg@chromium.org> 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 We can use the new host_build() function for this, so drop it. Signed-off-by: Simon Glass --- (no changes since v1) common/image-fit.c | 2 +- include/image.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index 17c6d4e7813..f44f5527b9f 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1277,7 +1277,7 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data, } printf("%s", algo); - if (IMAGE_ENABLE_IGNORE) { + if (!tools_build()) { fit_image_hash_get_ignore(fit, noffset, &ignore); if (ignore) { printf("-skipped "); diff --git a/include/image.h b/include/image.h index e190f59232d..a236180ccdd 100644 --- a/include/image.h +++ b/include/image.h @@ -27,7 +27,6 @@ struct fdt_region; #include #include -#define IMAGE_ENABLE_IGNORE 0 #define IMAGE_INDENT_STRING "" #else @@ -37,8 +36,6 @@ struct fdt_region; #include #include -/* Take notice of the 'ignore' property for hashes */ -#define IMAGE_ENABLE_IGNORE 1 #define IMAGE_INDENT_STRING " " #endif /* USE_HOSTCC */ -- 2.33.0.685.g46640cef36-goog