image: Drop IMAGE_ENABLE_SHAxxx

We already have a host Kconfig for these SHA options. Use
CONFIG_IS_ENABLED(SHAxxx) directly in the code shared with the host build,
so we can drop the unnecessary indirections.

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 9a47d1becfd0283ef83f0c00cff42d6118840f70..031d9d34c311e24fba4fcfecaea3435f8d87bc44 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1223,15 +1223,15 @@ int calculate_hash(const void *data, int data_len, const char *algo,
                sha1_csum_wd((unsigned char *)data, data_len,
                             (unsigned char *)value, CHUNKSZ_SHA1);
                *value_len = 20;
-       } else if (IMAGE_ENABLE_SHA256 && strcmp(algo, "sha256") == 0) {
+       } else if (CONFIG_IS_ENABLED(SHA256) && strcmp(algo, "sha256") == 0) {
                sha256_csum_wd((unsigned char *)data, data_len,
                               (unsigned char *)value, CHUNKSZ_SHA256);
                *value_len = SHA256_SUM_LEN;
-       } else if (IMAGE_ENABLE_SHA384 && strcmp(algo, "sha384") == 0) {
+       } else if (CONFIG_IS_ENABLED(SHA384) && strcmp(algo, "sha384") == 0) {
                sha384_csum_wd((unsigned char *)data, data_len,
                               (unsigned char *)value, CHUNKSZ_SHA384);
                *value_len = SHA384_SUM_LEN;
-       } else if (IMAGE_ENABLE_SHA512 && strcmp(algo, "sha512") == 0) {
+       } else if (CONFIG_IS_ENABLED(SHA512) && strcmp(algo, "sha512") == 0) {
                sha512_csum_wd((unsigned char *)data, data_len,
                               (unsigned char *)value, CHUNKSZ_SHA512);
                *value_len = SHA512_SUM_LEN;

diff --git a/include/image.h b/include/image.h
index bca9033e7f03ad56a8a0481ad6dea66fd51e9a03..dbb9bd0174a20c4199ed07814fa45e3b9c7f52e6 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -81,27 +81,6 @@ struct fdt_region;
 #define IMAGE_ENABLE_MD5       0
 #endif
 
-#if defined(CONFIG_FIT_SHA256) || \
-       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_FIT_SHA384)
-#define IMAGE_ENABLE_SHA384    1
-#else
-#define IMAGE_ENABLE_SHA384    0
-#endif
-
-#if defined(CONFIG_FIT_SHA512) || \
-       defined(CONFIG_SPL_FIT_SHA512)
-#define IMAGE_ENABLE_SHA512    1
-#else
-#define IMAGE_ENABLE_SHA512    0
-#endif
-
 #endif /* IMAGE_ENABLE_FIT */
 
 #ifdef CONFIG_SYS_BOOT_GET_CMDLINE