[31/49] image: Drop IMAGE_ENABLE_SHAxxx

Message ID	20210503171001.31.I5ba26e911d0ffff8af74ec113d11a5421b0c009f@changeid
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> 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 31/49] image: Drop IMAGE_ENABLE_SHAxxx Date: Mon, 3 May 2021 17:11:18 -0600 Message-Id: <20210503171001.31.I5ba26e911d0ffff8af74ec113d11a5421b0c009f@changeid> In-Reply-To: <20210503231136.744283-1-sjg@chromium.org> References: <20210503231136.744283-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	image: Reduce #ifdefs and ad-hoc defines in image code \| expand [00/49] image: Reduce #ifdefs and ad-hoc defines in image code [01/49] Add support for an owned buffer [02/49] compiler: Add a comment to host_build() [03/49] zstd: Create a function for use from U-Boot [04/49] btrfs: Use U-Boot API for decompression [05/49] image: Avoid switch default in image_decomp() [06/49] image: Update zstd to avoid reporting error twice [07/49] gzip: Avoid use of u64 [08/49] image: Update image_decomp() to avoid ifdefs [09/49] image: Split board code out into its own file [10/49] image: Fix up checkpatch warnings in image-board.c [11/49] image: Split host code out into its own file [12/49] image: Create a function to do manual relocation [13/49] image: Avoid #ifdefs for manual relocation [14/49] image: Remove ifdefs around image_setup_linux() el at [15/49] image: Add Kconfig options for FIT in the host build [16/49] kconfig: Add host support to CONFIG_IS_ENABLED() [17/49] image: Shorten FIT_ENABLE_SHAxxx_SUPPORT [18/49] image: Rename SPL_SHAxxx_SUPPORT to SPL_FIT_SHAxxx [19/49] hash: Use Kconfig to enable hashing in host tools [20/49] hash: Drop some #ifdefs in hash.c [21/49] image: Drop IMAGE_ENABLE_FIT [22/49] image: Drop IMAGE_ENABLE_OF_LIBFDT [23/49] image: Use Kconfig to enable CONFIG_FIT_VERBOSE on host [24/49] image: Rename CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT [25/49] image: Use Kconfig to enable FIT_RSASSA_PSS on host [26/49] Kconfig: Rename SPL_CRC32_SUPPORT to SPL_CRC32 [27/49] image: Drop IMAGE_ENABLE_CRC32 [28/49] Kconfig: Rename SPL_MD5_SUPPORT to SPL_MD5 [29/49] image: Drop IMAGE_ENABLE_MD5 [30/49] image: Drop IMAGE_ENABLE_SHA1 [31/49] image: Drop IMAGE_ENABLE_SHAxxx [32/49] image: Drop IMAGE_BOOT_GET_CMDLINE [33/49] image: Drop IMAGE_OF_BOARD_SETUP [34/49] image: Drop IMAGE_OF_SYSTEM_SETUP [35/49] image: Drop IMAGE_ENABLE_IGNORE [36/49] image: Drop IMAGE_ENABLE_SIGN/VERIFY defines [37/49] image: Drop IMAGE_ENABLE_BEST_MATCH [38/49] image: Drop IMAGE_ENABLE_EN/DECRYPT defines [39/49] image: Tidy up fit_unsupported_reset() [40/49] image: Drop unnecessary #ifdefs from image.h [41/49] image: Drop #ifdefs for fit_print_contents() [42/49] image: Drop most #ifdefs in image-board.c [43/49] image: Reduce variable scope in boot_get_ramdisk() [44/49] image: Split up boot_get_ramdisk() [45/49] image: Remove #ifdefs from select_ramdisk() [46/49] image: Remove some #ifdefs from image-fit and image-fit-sig [47/49] image: Reduce variable scope in boot_get_fdt() [48/49] image: Split up boot_get_fdt() [49/49] image: Remove #ifdefs from select_fdt()

Message ID

20210503171001.31.I5ba26e911d0ffff8af74ec113d11a5421b0c009f@changeid

State

Changes Requested

Delegated to:

Tom Rini

Headers

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 31/49] image: Drop IMAGE_ENABLE_SHAxxx
Date: Mon,  3 May 2021 17:11:18 -0600
Message-Id: 
 <20210503171001.31.I5ba26e911d0ffff8af74ec113d11a5421b0c009f@changeid>
In-Reply-To: <20210503231136.744283-1-sjg@chromium.org>
References: <20210503231136.744283-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

image: Reduce #ifdefs and ad-hoc defines in image code | expand

Commit Message

Simon Glass May 3, 2021, 11:11 p.m. UTC

We already have a host Kconfig for these SHA options. Use
CONFIG_IS_ENABLED(SHAxxx) directly in the code shared with the host build,
so we can drop the unnecessary indirections.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 common/image-fit.c |  6 +++---
 include/image.h    | 21 ---------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/common/image-fit.c b/common/image-fit.c
index 96794074b63..070835b3a87 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1222,15 +1222,15 @@  int calculate_hash(const void *data, int data_len, const char *algo,
 		sha1_csum_wd((unsigned char *)data, data_len,
 			     (unsigned char *)value, CHUNKSZ_SHA1);
 		*value_len = 20;
-	} else if (IMAGE_ENABLE_SHA256 && strcmp(algo, "sha256") == 0) {
+	} else if (CONFIG_IS_ENABLED(SHA256) && strcmp(algo, "sha256") == 0) {
 		sha256_csum_wd((unsigned char *)data, data_len,
 			       (unsigned char *)value, CHUNKSZ_SHA256);
 		*value_len = SHA256_SUM_LEN;
-	} else if (IMAGE_ENABLE_SHA384 && strcmp(algo, "sha384") == 0) {
+	} else if (CONFIG_IS_ENABLED(SHA384) && strcmp(algo, "sha384") == 0) {
 		sha384_csum_wd((unsigned char *)data, data_len,
 			       (unsigned char *)value, CHUNKSZ_SHA384);
 		*value_len = SHA384_SUM_LEN;
-	} else if (IMAGE_ENABLE_SHA512 && strcmp(algo, "sha512") == 0) {
+	} else if (CONFIG_IS_ENABLED(SHA512) && strcmp(algo, "sha512") == 0) {
 		sha512_csum_wd((unsigned char *)data, data_len,
 			       (unsigned char *)value, CHUNKSZ_SHA512);
 		*value_len = SHA512_SUM_LEN;
diff --git a/include/image.h b/include/image.h
index f5ff77bf0ca..f4b8dd7dd0f 100644
--- a/include/image.h
+++ b/include/image.h
@@ -47,27 +47,6 @@  struct fdt_region;
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
-#if defined(CONFIG_FIT_SHA256) || \
-	defined(CONFIG_SPL_FIT_SHA256)
-#define IMAGE_ENABLE_SHA256	1
-#else
-#define IMAGE_ENABLE_SHA256	0
-#endif
-
-#if defined(CONFIG_FIT_SHA384) || \
-	defined(CONFIG_SPL_FIT_SHA384)
-#define IMAGE_ENABLE_SHA384	1
-#else
-#define IMAGE_ENABLE_SHA384	0
-#endif
-
-#if defined(CONFIG_FIT_SHA512) || \
-	defined(CONFIG_SPL_FIT_SHA512)
-#define IMAGE_ENABLE_SHA512	1
-#else
-#define IMAGE_ENABLE_SHA512	0
-#endif
-
 #endif /* FIT */
 
 #ifdef CONFIG_SYS_BOOT_GET_CMDLINE

[31/49] image: Drop IMAGE_ENABLE_SHAxxx

Commit Message

Patch