leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

image: Drop IMAGE_ENABLE_SHAxxx

Browse Source 
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>
This commit is contained in:
Simon Glass 2021-07-14 17:05:35 -05:00 committed by Tom Rini
parent 0ad75696d0
commit 14f061dcb1
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/image-fit.c
View File

@ -1223,15 +1223,15 @@ int calculate_hash(const void *data, int data_len, const char *algo,
sha1_csum_wd((unsigned char *)data, data_len, sha1_csum_wd((unsigned char *)data, data_len,
(unsigned char *)value, CHUNKSZ_SHA1); (unsigned char *)value, CHUNKSZ_SHA1);
*value_len = 20; *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, sha256_csum_wd((unsigned char *)data, data_len,
(unsigned char *)value, CHUNKSZ_SHA256); (unsigned char *)value, CHUNKSZ_SHA256);
*value_len = SHA256_SUM_LEN; *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, sha384_csum_wd((unsigned char *)data, data_len,
(unsigned char *)value, CHUNKSZ_SHA384); (unsigned char *)value, CHUNKSZ_SHA384);
*value_len = SHA384_SUM_LEN; *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, sha512_csum_wd((unsigned char *)data, data_len,
(unsigned char *)value, CHUNKSZ_SHA512); (unsigned char *)value, CHUNKSZ_SHA512);
*value_len = SHA512_SUM_LEN; *value_len = SHA512_SUM_LEN;

21
include/image.h
View File

@ -81,27 +81,6 @@ struct fdt_region;
#define IMAGE_ENABLE_MD5 0 #define IMAGE_ENABLE_MD5 0
#endif #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 */ #endif /* IMAGE_ENABLE_FIT */
#ifdef CONFIG_SYS_BOOT_GET_CMDLINE #ifdef CONFIG_SYS_BOOT_GET_CMDLINE