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

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>
This commit is contained in:
Simon Glass 2021-07-14 17:05:30 -05:00 committed by Tom Rini
parent 0003b8ada9
commit f5bc9c25f3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/spl/Kconfig
View File

@ -429,7 +429,7 @@ config SPL_MD5_SUPPORT
applications where images may be changed maliciously, you should applications where images may be changed maliciously, you should
consider SHA256 or SHA384. consider SHA256 or SHA384.
config SPL_SHA1_SUPPORT config SPL_FIT_SHA1
bool "Support SHA1" bool "Support SHA1"
depends on SPL_FIT depends on SPL_FIT
select SHA1 select SHA1
@ -441,7 +441,7 @@ config SPL_SHA1_SUPPORT
due to the expanding computing power available to brute-force due to the expanding computing power available to brute-force
attacks. For more security, consider SHA256 or SHA384. attacks. For more security, consider SHA256 or SHA384.
config SPL_SHA256_SUPPORT config SPL_FIT_SHA256
bool "Support SHA256" bool "Support SHA256"
depends on SPL_FIT depends on SPL_FIT
select SHA256 select SHA256
@ -450,7 +450,7 @@ config SPL_SHA256_SUPPORT
checksum is a 256-bit (32-byte) hash value used to check that the checksum is a 256-bit (32-byte) hash value used to check that the
image contents have not been corrupted. image contents have not been corrupted.
config SPL_SHA384_SUPPORT config SPL_FIT_SHA384
bool "Support SHA384" bool "Support SHA384"
depends on SPL_FIT depends on SPL_FIT
select SHA384 select SHA384
@ -461,7 +461,7 @@ config SPL_SHA384_SUPPORT
image contents have not been corrupted. Use this for the highest image contents have not been corrupted. Use this for the highest
security. security.
config SPL_SHA512_SUPPORT config SPL_FIT_SHA512
bool "Support SHA512" bool "Support SHA512"
depends on SPL_FIT depends on SPL_FIT
select SHA512 select SHA512

8
include/image.h
View File

@ -68,7 +68,7 @@ struct fdt_region;
# ifdef CONFIG_SPL_MD5_SUPPORT # ifdef CONFIG_SPL_MD5_SUPPORT
# define IMAGE_ENABLE_MD5 1 # define IMAGE_ENABLE_MD5 1
# endif # endif
# ifdef CONFIG_SPL_SHA1_SUPPORT # ifdef CONFIG_SPL_FIT_SHA1
# define IMAGE_ENABLE_SHA1 1 # define IMAGE_ENABLE_SHA1 1
# endif # endif
# else # else
@ -90,21 +90,21 @@ struct fdt_region;
#endif #endif
#if defined(CONFIG_FIT_SHA256) || \ #if defined(CONFIG_FIT_SHA256) || \
defined(CONFIG_SPL_SHA256_SUPPORT) defined(CONFIG_SPL_FIT_SHA256)
#define IMAGE_ENABLE_SHA256 1 #define IMAGE_ENABLE_SHA256 1
#else #else
#define IMAGE_ENABLE_SHA256 0 #define IMAGE_ENABLE_SHA256 0
#endif #endif
#if defined(CONFIG_FIT_SHA384) || \ #if defined(CONFIG_FIT_SHA384) || \
defined(CONFIG_SPL_SHA384_SUPPORT) defined(CONFIG_SPL_FIT_SHA384)
#define IMAGE_ENABLE_SHA384 1 #define IMAGE_ENABLE_SHA384 1
#else #else
#define IMAGE_ENABLE_SHA384 0 #define IMAGE_ENABLE_SHA384 0
#endif #endif
#if defined(CONFIG_FIT_SHA512) || \ #if defined(CONFIG_FIT_SHA512) || \
defined(CONFIG_SPL_SHA512_SUPPORT) defined(CONFIG_SPL_FIT_SHA512)
#define IMAGE_ENABLE_SHA512 1 #define IMAGE_ENABLE_SHA512 1
#else #else
#define IMAGE_ENABLE_SHA512 0 #define IMAGE_ENABLE_SHA512 0