diff options
| author | Simon Glass <sjg@chromium.org> | 2021-07-14 17:05:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-16 12:58:55 -0400 |
| commit | 0ad75696d078e56ca8e4d09a875de8107590ab8a (patch) | |
| tree | e2b8a261ed30b0d45b20f6d3e8d4b0c613ba0b27 | |
| parent | 4b00fd1a84c1ef15f640da1d7a1081d0dbfbfbfe (diff) | |
| download | u-boot-0ad75696d078e56ca8e4d09a875de8107590ab8a.zip u-boot-0ad75696d078e56ca8e4d09a875de8107590ab8a.tar.gz u-boot-0ad75696d078e56ca8e4d09a875de8107590ab8a.tar.bz2 | |
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>
| -rw-r--r-- | common/image-fit.c | 2 | ||||
| -rw-r--r-- | include/image.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index e9b455d..9a47d1b 100644 --- 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 124448f..bca9033 100644 --- 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 |