From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex G. Date: Fri, 14 May 2021 10:34:45 -0500 Subject: [PATCH v2 19/50] image: Rename SPL_SHAxxx_SUPPORT to SPL_FIT_SHAxxx In-Reply-To: <20210506082420.v2.19.I5bccd990099952243d09f67d6485cd7366114cf3@changeid> References: <20210506142438.1310977-1-sjg@chromium.org> <20210506082420.v2.19.I5bccd990099952243d09f67d6485cd7366114cf3@changeid> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 5/6/21 9:24 AM, Simon Glass wrote: > 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 Reviewed-by: Alexandru Gagniuc > --- > > (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 FIT_SHAxxx is in common/Kconfig.boot, so it seems unnatural to have the SPL equivalents in a different file. I have a patch out to address this and move the options to the correct Kconfig, although your approach focuses FIT_SHA strictly. > 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 >