[PATCH v2 18/50] image: Shorten FIT_ENABLE_SHAxxx_SUPPORT

[Alex G.]

On 5/6/21 9:24 AM, Simon Glass wrote:
> The ENABLE part of this name is redundant, since all boolean Kconfig
> options serve to enable something. The SUPPORT part is also redundant
> since Kconfigs can be assumed to enable support for something. Together
> they just serve to make these options overly long and inconsistent
> with other options.
> 
> Rename FIT_ENABLE_SHAxxx_SUPPORT to FIT_SHAxxx
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Reviewed-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>

> ---
> 
> (no changes since v1)
> 
>   common/Kconfig.boot              |  6 +++---
>   configs/mt8516_pumpkin_defconfig |  2 +-
>   include/image.h                  | 12 ++++++------
>   3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/common/Kconfig.boot b/common/Kconfig.boot
> index 5a18d62d780..af3325a7ce2 100644
> --- a/common/Kconfig.boot
> +++ b/common/Kconfig.boot
> @@ -35,7 +35,7 @@ config FIT_EXTERNAL_OFFSET
>   	  could be put in the hole between data payload and fit image
>   	  header, such as CSF data on i.MX platform.
>   
> -config FIT_ENABLE_SHA256_SUPPORT
> +config FIT_SHA256
>   	bool "Support SHA256 checksum of FIT image contents"
>   	default y
>   	select SHA256
> @@ -44,7 +44,7 @@ config FIT_ENABLE_SHA256_SUPPORT
>   	  SHA256 checksum is a 256-bit (32-byte) hash value used to check that
>   	  the image contents have not been corrupted.
>   
> -config FIT_ENABLE_SHA384_SUPPORT
> +config FIT_SHA384
>   	bool "Support SHA384 checksum of FIT image contents"
>   	default n
>   	select SHA384
> @@ -54,7 +54,7 @@ config FIT_ENABLE_SHA384_SUPPORT
>   	  the image contents have not been corrupted. Use this for the highest
>   	  security.
>   
> -config FIT_ENABLE_SHA512_SUPPORT
> +config FIT_SHA512
>   	bool "Support SHA512 checksum of FIT image contents"
>   	default n
>   	select SHA512
> diff --git a/configs/mt8516_pumpkin_defconfig b/configs/mt8516_pumpkin_defconfig
> index 5270ec28cbd..d330c03db3c 100644
> --- a/configs/mt8516_pumpkin_defconfig
> +++ b/configs/mt8516_pumpkin_defconfig
> @@ -13,7 +13,7 @@ CONFIG_DEBUG_UART_CLOCK=26000000
>   CONFIG_DEFAULT_DEVICE_TREE="mt8516-pumpkin"
>   CONFIG_DEBUG_UART=y
>   CONFIG_FIT=y
> -# CONFIG_FIT_ENABLE_SHA256_SUPPORT is not set
> +# CONFIG_FIT_SHA256 is not set
>   # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
>   CONFIG_DEFAULT_FDT_FILE="mt8516-pumpkin"
>   # CONFIG_DISPLAY_BOARDINFO is not set
> diff --git a/include/image.h b/include/image.h
> index 459685d4d43..9319a779b93 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -31,9 +31,9 @@ struct fdt_region;
>   #define IMAGE_ENABLE_OF_LIBFDT	1
>   #define CONFIG_FIT_VERBOSE	1 /* enable fit_format_{error,warning}() */
>   #define CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT 1
> -#define CONFIG_FIT_ENABLE_SHA256_SUPPORT
> -#define CONFIG_FIT_ENABLE_SHA384_SUPPORT
> -#define CONFIG_FIT_ENABLE_SHA512_SUPPORT
> +#define CONFIG_FIT_SHA256
> +#define CONFIG_FIT_SHA384
> +#define CONFIG_FIT_SHA512
>   #define CONFIG_SHA1
>   #define CONFIG_SHA256
>   #define CONFIG_SHA384
> @@ -89,21 +89,21 @@ struct fdt_region;
>   #define IMAGE_ENABLE_SHA1	0
>   #endif
>   
> -#if defined(CONFIG_FIT_ENABLE_SHA256_SUPPORT) || \
> +#if defined(CONFIG_FIT_SHA256) || \
>   	defined(CONFIG_SPL_SHA256_SUPPORT)
>   #define IMAGE_ENABLE_SHA256	1
>   #else
>   #define IMAGE_ENABLE_SHA256	0
>   #endif
>   
> -#if defined(CONFIG_FIT_ENABLE_SHA384_SUPPORT) || \
> +#if defined(CONFIG_FIT_SHA384) || \
>   	defined(CONFIG_SPL_SHA384_SUPPORT)
>   #define IMAGE_ENABLE_SHA384	1
>   #else
>   #define IMAGE_ENABLE_SHA384	0
>   #endif
>   
> -#if defined(CONFIG_FIT_ENABLE_SHA512_SUPPORT) || \
> +#if defined(CONFIG_FIT_SHA512) || \
>   	defined(CONFIG_SPL_SHA512_SUPPORT)
>   #define IMAGE_ENABLE_SHA512	1
>   #else
>