image: Drop IMAGE_ENABLE_SHA1

We already have a host Kconfig for SHA1. Use CONFIG_IS_ENABLED(SHA1)
directly in the code shared with the host build, so we can drop the
unnecessary indirection.

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/image-fit.c b/common/image-fit.c
index e9b455deadba74f29fd5efb970749e35fb49c38d..9a47d1becfd0283ef83f0c00cff42d6118840f70 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1219,7 +1219,7 @@ int calculate_hash(const void *data, int data_len, const char *algo,
                                                        CHUNKSZ_CRC32);
                *((uint32_t *)value) = cpu_to_uimage(*((uint32_t *)value));
                *value_len = 4;
-       } else if (IMAGE_ENABLE_SHA1 && strcmp(algo, "sha1") == 0) {
+       } else if (CONFIG_IS_ENABLED(SHA1) && strcmp(algo, "sha1") == 0) {
                sha1_csum_wd((unsigned char *)data, data_len,
                             (unsigned char *)value, CHUNKSZ_SHA1);
                *value_len = 20;

diff --git a/include/image.h b/include/image.h
index 124448f9e4fad34706ce59b257d000b605e59ab0..bca9033e7f03ad56a8a0481ad6dea66fd51e9a03 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -68,13 +68,9 @@ struct fdt_region;
 #  ifdef CONFIG_SPL_MD5
 #   define IMAGE_ENABLE_MD5    1
 #  endif
-#  ifdef CONFIG_SPL_FIT_SHA1
-#   define IMAGE_ENABLE_SHA1   1
-#  endif
 # else
 #  define IMAGE_ENABLE_CRC32   1
 #  define IMAGE_ENABLE_MD5     1
-#  define IMAGE_ENABLE_SHA1    1
 # endif
 
 #ifndef IMAGE_ENABLE_CRC32
@@ -85,10 +81,6 @@ struct fdt_region;
 #define IMAGE_ENABLE_MD5       0
 #endif
 
-#ifndef IMAGE_ENABLE_SHA1
-#define IMAGE_ENABLE_SHA1      0
-#endif
-
 #if defined(CONFIG_FIT_SHA256) || \
        defined(CONFIG_SPL_FIT_SHA256)
 #define IMAGE_ENABLE_SHA256    1