All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH 18/49] image: Rename SPL_SHAxxx_SUPPORT to SPL_FIT_SHAxxx
Date: Mon,  3 May 2021 17:11:05 -0600	[thread overview]
Message-ID: <20210503171001.18.I5bccd990099952243d09f67d6485cd7366114cf3@changeid> (raw)
In-Reply-To: <20210503231136.744283-1-sjg@chromium.org>

These option are named inconsistently with other SPL options, thus making
them incompatible with the CONFIG_IS_ENABLED() macro. Rename them.

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

(no changes since v1)

 common/spl/Kconfig | 8 ++++----
 include/image.h    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index df5468f1ac2..d94b9892175 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -429,7 +429,7 @@ config SPL_MD5_SUPPORT
 	  applications where images may be changed maliciously, you should
 	  consider SHA256 or SHA384.
 
-config SPL_SHA1_SUPPORT
+config SPL_FIT_SHA1
 	bool "Support SHA1"
 	depends on SPL_FIT
 	select SHA1
@@ -441,7 +441,7 @@ config SPL_SHA1_SUPPORT
 	  due to the expanding computing power available to brute-force
 	  attacks. For more security, consider SHA256 or SHA384.
 
-config SPL_SHA256_SUPPORT
+config SPL_FIT_SHA256
 	bool "Support SHA256"
 	depends on SPL_FIT
 	select SHA256
@@ -450,7 +450,7 @@ config SPL_SHA256_SUPPORT
 	  checksum is a 256-bit (32-byte) hash value used to check that the
 	  image contents have not been corrupted.
 
-config SPL_SHA384_SUPPORT
+config SPL_FIT_SHA384
 	bool "Support SHA384"
 	depends on SPL_FIT
 	select SHA384
@@ -461,7 +461,7 @@ config SPL_SHA384_SUPPORT
 	  image contents have not been corrupted. Use this for the highest
 	  security.
 
-config SPL_SHA512_SUPPORT
+config SPL_FIT_SHA512
 	bool "Support SHA512"
 	depends on SPL_FIT
 	select SHA512
diff --git a/include/image.h b/include/image.h
index 9319a779b93..3284f36c97a 100644
--- a/include/image.h
+++ b/include/image.h
@@ -68,7 +68,7 @@ struct fdt_region;
 #  ifdef CONFIG_SPL_MD5_SUPPORT
 #   define IMAGE_ENABLE_MD5	1
 #  endif
-#  ifdef CONFIG_SPL_SHA1_SUPPORT
+#  ifdef CONFIG_SPL_FIT_SHA1
 #   define IMAGE_ENABLE_SHA1	1
 #  endif
 # else
@@ -90,21 +90,21 @@ struct fdt_region;
 #endif
 
 #if defined(CONFIG_FIT_SHA256) || \
-	defined(CONFIG_SPL_SHA256_SUPPORT)
+	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_SHA384_SUPPORT)
+	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_SHA512_SUPPORT)
+	defined(CONFIG_SPL_FIT_SHA512)
 #define IMAGE_ENABLE_SHA512	1
 #else
 #define IMAGE_ENABLE_SHA512	0
-- 
2.31.1.527.g47e6f16901-goog

  parent reply	other threads:[~2021-05-03 23:11 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-03 23:10 [PATCH 00/49] image: Reduce #ifdefs and ad-hoc defines in image code Simon Glass
2021-05-03 23:10 ` Simon Glass
2021-05-03 23:10 ` [PATCH 01/49] Add support for an owned buffer Simon Glass
2021-05-04  6:59   ` Rasmus Villemoes
2021-05-05 23:37     ` Simon Glass
2021-05-03 23:10 ` [PATCH 02/49] compiler: Add a comment to host_build() Simon Glass
2021-05-04  7:01   ` Rasmus Villemoes
2021-05-03 23:10 ` [PATCH 03/49] zstd: Create a function for use from U-Boot Simon Glass
2021-05-03 23:10 ` [PATCH 04/49] btrfs: Use U-Boot API for decompression Simon Glass
2021-05-03 23:10   ` Simon Glass
2021-05-03 23:25   ` Qu Wenruo
2021-05-03 23:25     ` Qu Wenruo
2021-05-03 23:45   ` Marek Behun
2021-05-03 23:45     ` Marek Behun
2021-05-04 16:58     ` Simon Glass
2021-05-04 16:58       ` Simon Glass
2021-05-03 23:10 ` [PATCH 05/49] image: Avoid switch default in image_decomp() Simon Glass
2021-05-03 23:10 ` [PATCH 06/49] image: Update zstd to avoid reporting error twice Simon Glass
2021-05-03 23:10 ` [PATCH 07/49] gzip: Avoid use of u64 Simon Glass
2021-05-03 23:10 ` [PATCH 08/49] image: Update image_decomp() to avoid ifdefs Simon Glass
2021-05-03 23:10 ` [PATCH 09/49] image: Split board code out into its own file Simon Glass
2021-05-03 23:10 ` [PATCH 10/49] image: Fix up checkpatch warnings in image-board.c Simon Glass
2021-05-03 23:10 ` [PATCH 11/49] image: Split host code out into its own file Simon Glass
2021-05-03 23:10 ` [PATCH 12/49] image: Create a function to do manual relocation Simon Glass
2021-05-04  7:17   ` Rasmus Villemoes
2021-05-07  2:45     ` Simon Glass
2021-05-03 23:11 ` [PATCH 13/49] image: Avoid #ifdefs for " Simon Glass
2021-05-03 23:11 ` [PATCH 14/49] image: Remove ifdefs around image_setup_linux() el at Simon Glass
2021-05-03 23:11 ` [PATCH 15/49] image: Add Kconfig options for FIT in the host build Simon Glass
2021-05-03 23:11 ` [PATCH 16/49] kconfig: Add host support to CONFIG_IS_ENABLED() Simon Glass
2021-05-04  7:28   ` Rasmus Villemoes
2021-05-03 23:11 ` [PATCH 17/49] image: Shorten FIT_ENABLE_SHAxxx_SUPPORT Simon Glass
2021-05-03 23:11 ` Simon Glass [this message]
2021-05-03 23:11 ` [PATCH 19/49] hash: Use Kconfig to enable hashing in host tools Simon Glass
2021-05-03 23:11 ` [PATCH 20/49] hash: Drop some #ifdefs in hash.c Simon Glass
2021-05-03 23:11 ` [PATCH 21/49] image: Drop IMAGE_ENABLE_FIT Simon Glass
2021-05-03 23:11 ` [PATCH 22/49] image: Drop IMAGE_ENABLE_OF_LIBFDT Simon Glass
2021-05-03 23:11 ` [PATCH 23/49] image: Use Kconfig to enable CONFIG_FIT_VERBOSE on host Simon Glass
2021-05-03 23:11 ` [PATCH 24/49] image: Rename CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT Simon Glass
2021-05-03 23:11 ` [PATCH 25/49] image: Use Kconfig to enable FIT_RSASSA_PSS on host Simon Glass
2021-05-03 23:11 ` [PATCH 26/49] Kconfig: Rename SPL_CRC32_SUPPORT to SPL_CRC32 Simon Glass
2021-05-03 23:11 ` [PATCH 27/49] image: Drop IMAGE_ENABLE_CRC32 Simon Glass
2021-05-03 23:11 ` [PATCH 28/49] Kconfig: Rename SPL_MD5_SUPPORT to SPL_MD5 Simon Glass
2021-05-03 23:11 ` [PATCH 29/49] image: Drop IMAGE_ENABLE_MD5 Simon Glass
2021-05-03 23:11 ` [PATCH 30/49] image: Drop IMAGE_ENABLE_SHA1 Simon Glass
2021-05-03 23:11 ` [PATCH 31/49] image: Drop IMAGE_ENABLE_SHAxxx Simon Glass
2021-05-03 23:11 ` [PATCH 32/49] image: Drop IMAGE_BOOT_GET_CMDLINE Simon Glass
2021-05-03 23:11 ` [PATCH 33/49] image: Drop IMAGE_OF_BOARD_SETUP Simon Glass
2021-05-03 23:11 ` [PATCH 34/49] image: Drop IMAGE_OF_SYSTEM_SETUP Simon Glass
2021-05-03 23:11 ` [PATCH 35/49] image: Drop IMAGE_ENABLE_IGNORE Simon Glass
2021-05-03 23:11 ` [PATCH 36/49] image: Drop IMAGE_ENABLE_SIGN/VERIFY defines Simon Glass
2021-05-03 23:11 ` [PATCH 37/49] image: Drop IMAGE_ENABLE_BEST_MATCH Simon Glass
2021-05-03 23:11 ` [PATCH 38/49] image: Drop IMAGE_ENABLE_EN/DECRYPT defines Simon Glass
2021-05-03 23:11 ` [PATCH 39/49] image: Tidy up fit_unsupported_reset() Simon Glass
2021-05-03 23:11 ` [PATCH 40/49] image: Drop unnecessary #ifdefs from image.h Simon Glass
2021-05-03 23:11 ` [PATCH 41/49] image: Drop #ifdefs for fit_print_contents() Simon Glass
2021-05-03 23:11 ` [PATCH 42/49] image: Drop most #ifdefs in image-board.c Simon Glass
2021-05-03 23:11 ` [PATCH 43/49] image: Reduce variable scope in boot_get_ramdisk() Simon Glass
2021-05-03 23:11 ` [PATCH 44/49] image: Split up boot_get_ramdisk() Simon Glass
2021-05-03 23:11 ` [PATCH 45/49] image: Remove #ifdefs from select_ramdisk() Simon Glass
2021-05-03 23:11 ` [PATCH 46/49] image: Remove some #ifdefs from image-fit and image-fit-sig Simon Glass
2021-05-03 23:11 ` [PATCH 47/49] image: Reduce variable scope in boot_get_fdt() Simon Glass
2021-05-03 23:11 ` [PATCH 48/49] image: Split up boot_get_fdt() Simon Glass
2021-05-03 23:11 ` [PATCH 49/49] image: Remove #ifdefs from select_fdt() Simon Glass
2021-05-04 21:40 ` [PATCH 00/49] image: Reduce #ifdefs and ad-hoc defines in image code Tom Rini
2021-05-04 21:40   ` Tom Rini
2021-05-04 21:49   ` Simon Glass
2021-05-04 21:49     ` Simon Glass
2021-05-04 23:24   ` Sean Anderson
2021-05-04 23:24     ` Sean Anderson
2021-05-05  1:11     ` Tom Rini
2021-05-05  1:11       ` Tom Rini
2021-05-05 23:38   ` Simon Glass
2021-05-05 23:38     ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210503171001.18.I5bccd990099952243d09f67d6485cd7366114cf3@changeid \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.