Message ID | 20210503231136.744283-8-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=EC2n0ASa; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FYzVW2N06z9sSs for <incoming@patchwork.ozlabs.org>; Tue, 4 May 2021 09:20:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C82AC82CE3; Tue, 4 May 2021 01:18:51 +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="EC2n0ASa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AFDE282CE3; Tue, 4 May 2021 01:18: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.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 0D1AA82D1C for <u-boot@lists.denx.de>; Tue, 4 May 2021 01:12:26 +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-io1-xd2a.google.com with SMTP id a11so5525085ioo.0 for <u-boot@lists.denx.de>; Mon, 03 May 2021 16:12:25 -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=ov+xMcsGo12ofELg0hBudRRwd1fTiVg5rFf9CesMtoo=; b=EC2n0ASauSuMZz7mSCWQWHXhf0i9p5WCmwuqVG6Nx0nS1eX60FrkObxilWCB2YiaoE PaP9FB0c0HrpgJtGDh3lbq8IJCZO2jm5cTqOJN1HvM1K8Bat7YfthT8xxBcyPktAjGE/ sEvtruLdg3JGHv63EhbT4eaZznOpxs/snuuDM= 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=ov+xMcsGo12ofELg0hBudRRwd1fTiVg5rFf9CesMtoo=; b=q7u6L6kIZnb4aVKSIzyb3hwBuVnnkSs4LRf1xIRc+6OV12ZrocYUOj7vtg1cBw8TML 3UQd0Ytya3h8kL+IgKL2BtVGMS6a+A7bkCyvQesxv2IKWqrmlh+eztlFHeS0t44kB3hj XxvVmLf1cM0DWSa/QosvPANE4iZ12xxErQPY9JT6fsE9p5WU0Bps7dGfodc4CDf2TJVd J433Ef5kKMduYQMn14O5QAky8K7vb00584dszl1FkPUnbksun7IeyTa4fBczeSZApqDJ eVOAFOrmTzpdDzks9zUvUA4WFFz8l4brC9l3/PWepUnYHos2pqGBJemmcksX74ukoWwP rNiw== X-Gm-Message-State: AOAM533pT/nSMmkqHehcJFfmtqEdUcBr1yEOj/JqXiDeqARamAQ/C/UM g0cG0BjH+rsOggIRXer/ebjGeqlcWMl1ug== X-Google-Smtp-Source: ABdhPJxupl492nyUpR49Y94VsU0wNLqG6iqdcixLXovf7XhoVTBmhiX5EDBz/E8E1Asbk0EJWg8eUw== X-Received: by 2002:a5e:9316:: with SMTP id k22mr16428329iom.160.1620083544675; Mon, 03 May 2021 16:12:24 -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 o6sm422727ioa.21.2021.05.03.16.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 16:12:24 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Bin Meng <bmeng.cn@gmail.com>, Robert Marko <robert.marko@sartura.hr>, Andre Przywara <andre.przywara@arm.com>, Masahiro Yamada <masahiroy@kernel.org>, Simon Glass <sjg@chromium.org>, AKASHI Takahiro <takahiro.akashi@linaro.org>, Alexandru Gagniuc <mr.nuke.me@gmail.com>, Joe Hershberger <joe.hershberger@ni.com>, Joel Stanley <joel@jms.id.au>, Marek Vasut <marex@denx.de>, Michal Simek <michal.simek@xilinx.com>, Naoki Hayama <naoki.hayama@lineo.co.jp>, Reuben Dowle <reubendowle0@gmail.com>, Sebastian Reichel <sebastian.reichel@collabora.com> Subject: [PATCH 35/49] image: Drop IMAGE_ENABLE_IGNORE Date: Mon, 3 May 2021 17:11:22 -0600 Message-Id: <20210503231136.744283-8-sjg@chromium.org> X-Mailer: git-send-email 2.31.1.527.g47e6f16901-goog In-Reply-To: <20210503231136.744283-1-sjg@chromium.org> References: <20210503231136.744283-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
image: Reduce #ifdefs and ad-hoc defines in image code
|
expand
|
diff --git a/common/image-fit.c b/common/image-fit.c index 070835b3a87..c13ff6bba24 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1262,7 +1262,7 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data, } printf("%s", algo); - if (IMAGE_ENABLE_IGNORE) { + if (!host_build()) { fit_image_hash_get_ignore(fit, noffset, &ignore); if (ignore) { printf("-skipped "); diff --git a/include/image.h b/include/image.h index eb5ca8a32d3..64866c609f4 100644 --- a/include/image.h +++ b/include/image.h @@ -27,7 +27,6 @@ struct fdt_region; #include <sys/types.h> #include <linux/kconfig.h> -#define IMAGE_ENABLE_IGNORE 0 #define IMAGE_INDENT_STRING "" #else @@ -36,8 +35,6 @@ struct fdt_region; #include <asm/u-boot.h> #include <command.h> -/* Take notice of the 'ignore' property for hashes */ -#define IMAGE_ENABLE_IGNORE 1 #define IMAGE_INDENT_STRING " " #endif /* USE_HOSTCC */
We can use the new host_build() function for this, so drop it. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) common/image-fit.c | 2 +- include/image.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)