image: Rename SPL_SHAxxx_SUPPORT to SPL_FIT_SHAxxx

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>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index fa80524cfb2c625a2bb1aa50fa6a93d6536bd0ac..2b89ce71c145386c7431b9c3bdf64080e76e88db 100644 (file)
--- 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 e54f12f4729632233007444eaf2bc10209317859..bf92f6235de144e38ce81bd032afd095c7696c96 100644 (file)
--- 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