lib: move hash CONFIG options to Kconfig

Commit 94e3c8c4fd7b ("crypto/fsl - Add progressive hashing support
using hardware acceleration.") created entries for CONFIG_SHA1,
CONFIG_SHA256, CONFIG_SHA_HW_ACCEL, and CONFIG_SHA_PROG_HW_ACCEL.
However, no defconfig has migrated to it.  Complete the move by first
adding additional logic to various Kconfig files to select this when
required and then use the moveconfig tool.  In many cases we can select
these because they are required to implement other drivers.  We also
correct how we include the various hashing algorithms in SPL.

This commit was generated as follows (after Kconfig additions):

[1] tools/moveconfig.py -y SHA1 SHA256 SHA_HW_ACCEL
[2] tools/moveconfig.py -y SHA_PROG_HW_ACCEL

Note:
We cannot move SHA_HW_ACCEL and SHA_PROG_HW_ACCEL simultaneously
because there is dependency between them.

Cc: Poonam Aggrwal <[email protected]>
Cc: Naveen Burmi <[email protected]>
Cc: Po Liu <[email protected]>
Cc: Shengzhou Liu <[email protected]>
Cc: Priyanka Jain <[email protected]>
Cc: Shaohui Xie <[email protected]>
Cc: Chunhe Lan <[email protected]>
Cc: Chander Kashyap <[email protected]>
Cc: Steve Rae <[email protected]>
Cc: Dirk Eibach <[email protected]>
Cc: Feng Li <[email protected]>
Cc: Alison Wang <[email protected]>
Cc: Sumit Garg <[email protected]>
Cc: Mingkai Hu <[email protected]>
Cc: York Sun <[email protected]>
Cc: Prabhakar Kushwaha <[email protected]>
Cc: Jaehoon Chung <[email protected]>
Cc: Akshay Saraswat <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Jagan Teki <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Signed-off-by: Tom Rini <[email protected]>

diff --git a/Kconfig b/Kconfig
index 0a445313f62cee1c2c96eb4aa505cd15a2b6aa7d..1b19b7b76c71edea4bf00e2dbe7d6d3e6f37f0d7 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -145,6 +145,7 @@ menu "Boot images"
 config FIT
        bool "Support Flattened Image Tree"
        select MD5
+       select SHA1
        help
          This option allows you to boot the new uImage structure,
          Flattened Image Tree.  FIT is formally a FDT, which can include
@@ -159,6 +160,7 @@ if FIT
 
 config FIT_ENABLE_SHA256_SUPPORT
        bool "Support SHA256 checksum of FIT image contents"
+       select SHA256
        default y
        help
          Enable this to support SHA256 checksum of FIT image contents. A

diff --git a/README b/README
index 15ef469e6c532ed7062461639df9c31b0b94e2b2..121d44a0c1f6a368091f0c2119219c70ef9488bf 100644 (file)
--- a/README
+++ b/README
@@ -2756,19 +2756,6 @@ The following options need to be configured:
                Enable the hash verify command (hash -v). This adds to code
                size a little.
 
-               CONFIG_SHA1 - This option enables support of hashing using SHA1
-               algorithm. The hash is calculated in software.
-               CONFIG_SHA256 - This option enables support of hashing using
-               SHA256 algorithm. The hash is calculated in software.
-               CONFIG_SHA_HW_ACCEL - This option enables hardware acceleration
-               for SHA1/SHA256 hashing.
-               This affects the 'hash' command and also the
-               hash_lookup_algo() function.
-               CONFIG_SHA_PROG_HW_ACCEL - This option enables
-               hardware-acceleration for SHA1/SHA256 progressive hashing.
-               Data can be streamed in a block at a time and the hashing
-               is performed in hardware.
-
                Note: There is also a sha1sum command, which should perhaps
                be deprecated in favour of 'hash sha1'.
 

diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index c20a3c348d4a8027699425c6e06cae0e0b9e76eb..bd39b6e267ac85dc86276a7aab823bb7467fa5fb 100644 (file)
--- a/arch/arm/include/asm/fsl_secure_boot.h
+++ b/arch/arm/include/asm/fsl_secure_boot.h
@@ -10,8 +10,6 @@
 #ifdef CONFIG_CHAIN_OF_TRUST
 #define CONFIG_CMD_ESBC_VALIDATE
 #define CONFIG_FSL_SEC_MON
-#define CONFIG_SHA_HW_ACCEL
-#define CONFIG_SHA_PROG_HW_ACCEL
 
 #ifdef CONFIG_SPL_BUILD
 /*

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 46981a5933b23e237a912dca9b9726c629324afe..24cb99e466b0a19cb0c4ac4c1f6feee8d0dbdbea 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -17,6 +17,7 @@ config ARCH_EXYNOS5
        bool "Exynos5 SoC family"
        select CPU_V7
        select BOARD_EARLY_INIT_F
+       select SHA_HW_ACCEL
        help
          Samsung Exynos5 SoC family are based on ARM Cortex-A15 CPU (and
          Cortex-A7 CPU in big.LITTLE configuration). There are multiple SoCs

diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index 62ce816b135b28f147632a51f3b39bf551fca2a1..8f66fc5182d92734964db851a16e03e8b8076ac3 100644 (file)
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -101,7 +101,6 @@
 
 #define CONFIG_CMD_ESBC_VALIDATE
 #define CONFIG_FSL_SEC_MON
-#define CONFIG_SHA_PROG_HW_ACCEL
 
 #ifndef CONFIG_SPL_BUILD
 /*

diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
index a5e302f92405f4a31b1965db38d5ab22b9e1a4f1..540885786b8b7305ca660eda61fcc2e094d7b4a3 100644 (file)
--- a/board/freescale/common/Kconfig
+++ b/board/freescale/common/Kconfig
@@ -3,5 +3,7 @@ config CHAIN_OF_TRUST
        imply CMD_BLOB
        select FSL_CAAM
        select SPL_BOARD_INIT if (ARM && SPL)
+       select SHA_HW_ACCEL
+       select SHA_PROG_HW_ACCEL
        bool
        default y

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 92b476e945d4699a6019ce1fc598019057820649..eabb2d02ec44be51d19221ebd2ab50a73318ce21 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -187,6 +187,7 @@ config SPL_MD5_SUPPORT
 config SPL_SHA1_SUPPORT
        bool "Support SHA1"
        depends on SPL_FIT
+       select SHA1
        help
          Enable this to support SHA1 in FIT images within SPL. A SHA1
          checksum is a 160-bit (20-byte) hash value used to check that the
@@ -198,6 +199,7 @@ config SPL_SHA1_SUPPORT
 config SPL_SHA256_SUPPORT
        bool "Support SHA256"
        depends on SPL_FIT
+       select SHA256
        help
          Enable this to support SHA256 in FIT images within SPL. A SHA256
          checksum is a 256-bit (32-byte) hash value used to check that the
@@ -229,6 +231,8 @@ config SPL_CRYPTO_SUPPORT
 
 config SPL_HASH_SUPPORT
        bool "Support hashing drivers"
+       select SHA1
+       select SHA256
        depends on SPL
        help
          Enable hashing drivers in SPL. These drivers can be used to

diff --git a/configs/bcm911360_entphn-ns_defconfig b/configs/bcm911360_entphn-ns_defconfig
index 4f045903bfcfec02a1b002fc6cd541f31bc710b8..61336d38f0dd866a9df9a40268763f8abba1ba29 100644 (file)
--- a/configs/bcm911360_entphn-ns_defconfig
+++ b/configs/bcm911360_entphn-ns_defconfig
@@ -18,4 +18,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/bcm911360_entphn_defconfig b/configs/bcm911360_entphn_defconfig
index 2469792f68bedd9db1fdcac1623268470bd90268..cbef3d8365028f7a8def569fc47f1f9066d24e60 100644 (file)
--- a/configs/bcm911360_entphn_defconfig
+++ b/configs/bcm911360_entphn_defconfig
@@ -18,4 +18,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/bcm911360k_defconfig b/configs/bcm911360k_defconfig
index 83afce41d60b8badf83127167b56d5d107eb3919..b12420636193ab46d0e8b60aa82383532257b0af 100644 (file)
--- a/configs/bcm911360k_defconfig
+++ b/configs/bcm911360k_defconfig
@@ -18,4 +18,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/bcm958300k-ns_defconfig b/configs/bcm958300k-ns_defconfig
index b21fea4331ec56019422695e2920326404da712e..f271fa06e5c89542500f3cd53dac6627462df2f6 100644 (file)
--- a/configs/bcm958300k-ns_defconfig
+++ b/configs/bcm958300k-ns_defconfig
@@ -18,4 +18,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig
index 83afce41d60b8badf83127167b56d5d107eb3919..b12420636193ab46d0e8b60aa82383532257b0af 100644 (file)
--- a/configs/bcm958300k_defconfig
+++ b/configs/bcm958300k_defconfig
@@ -18,4 +18,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/bcm958305k_defconfig b/configs/bcm958305k_defconfig
index 83afce41d60b8badf83127167b56d5d107eb3919..b12420636193ab46d0e8b60aa82383532257b0af 100644 (file)
--- a/configs/bcm958305k_defconfig
+++ b/configs/bcm958305k_defconfig
@@ -18,4 +18,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/bcm958622hr_defconfig b/configs/bcm958622hr_defconfig
index a639336d94a1c11655c81676eb60927748016197..9ffbe4b673bbcc3447a34e343339f6bf88049514 100644 (file)
--- a/configs/bcm958622hr_defconfig
+++ b/configs/bcm958622hr_defconfig
@@ -16,4 +16,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_FAT=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
index bc2e7b43310faf1581743b50f727c17012c63e37..e85da506fef2173fb0220e1a4baf10abe7078dc5 100644 (file)
--- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
@@ -19,3 +19,4 @@ CONFIG_DM=y
 CONFIG_SYS_NS16550=y
 CONFIG_TPM_AUTH_SESSIONS=y
 CONFIG_TPM=y
+CONFIG_SHA1=y

diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
index 7ec77a1102d1cc443627d0e11e7270a092ac9d67..061dd171a986823e43cf13cd5474aa061a926397 100644 (file)
--- a/configs/controlcenterd_TRAILBLAZER_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_defconfig
@@ -19,3 +19,4 @@ CONFIG_DM=y
 CONFIG_SYS_NS16550=y
 CONFIG_TPM_AUTH_SESSIONS=y
 CONFIG_TPM=y
+CONFIG_SHA1=y

diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig
index 31889598e8e7c5a4246f77a86a9bfcf63750008f..3ccd196714a6fa2f9528e162194040977a3249a4 100644 (file)
--- a/drivers/crypto/fsl/Kconfig
+++ b/drivers/crypto/fsl/Kconfig
@@ -1,5 +1,6 @@
 config FSL_CAAM
        bool "Freescale Crypto Driver Support"
+       select SHA_HW_ACCEL
        help
          Enables the Freescale's Cryptographic Accelerator and Assurance
          Module (CAAM), also known as the SEC version 4 (SEC4). The driver uses

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 2041b7bb3e58238b65325b0772d95e3627671805..e94ac5ea2c090b7746da750cecf30c24595922e7 100644 (file)
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -714,7 +714,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 72dc8ba71041501dce0bddb7d913ff3b7a91f99d..bce6229496f98540b14f2b0102fd0229fd7107f5 100644 (file)
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -331,7 +331,6 @@ extern unsigned long get_sdram_size(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #ifdef CONFIG_USB_EHCI_HCD

diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 1b956fc7da653164e5cb3d097c45b4c1960152e0..b303b4b51b62538244e8f26296e3977385393ef6 100644 (file)
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -528,7 +528,6 @@ combinations. this should be removed later
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index f95c3b9eebbc1e98f31aed8eb9018c9ca3ff904b..b8c823cc566e75d7be2e6397ba6bf8f61e12123e 100644 (file)
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -444,7 +444,6 @@
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 867004fb4899853affd3119e7ab6d7df2f0db7ed..ce32f431fcb20f4893c2876932abf9a83aa54772 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -738,7 +738,6 @@ extern unsigned long get_sdram_size(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 7629fe8eb49610bddad585660cfcfde6b4dcca55..66c1bba2f4b6a22b80d31613fdc7c82b1210cd3d 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -607,7 +607,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 42e692c4a02104e4a7118c1dabc7fd81eb06c501..94828931ae8363a60f071f6725e713fb9141ac29 100644 (file)
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -868,7 +868,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #include <asm/fsl_secure_boot.h>

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index c2175bda345a91dc174d6fa4dcbd0afd32104f25..373cb2a81c91125ad88602fd618a96848f17f52e 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -887,7 +887,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #include <asm/fsl_secure_boot.h>

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 25658871e47025f7f6229a862011658208ad9cb9..0ae9eda463d2dc105b5245a5fcfa3a5de0963e3f 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -671,7 +671,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index d2ece40d4ac34ddf9888931df4b003d83394fa3d..b3d595709ec5d7628b75604a8bacb885fe5b84e5 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -783,7 +783,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 02fd37d5cb32fc6d0ba27ba381c42271c58cbd13..a426da40d7929401b29ac07a930fcb913b369774 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -755,7 +755,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index faa1111e9f1185e2a3e3dd28b0ac9dca453f2752..315067332b8d1e514205cd9bd0e596feefdba173 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -700,7 +700,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 5d030d1179652355e963d7097176cab42de19e77..28476c4f2f4818fed56c91f26b91f12deeb39cd7 100644 (file)
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -501,7 +501,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 8ebfde19f936684e0d0b3afb2458badd18a84bff..ba725d21e568dbeb84fef35b99cb11eb75bac3ff 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -699,7 +699,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 

diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index d9b88fa2d315936424fa6c19e08be86a578ef8da..d264e1c77b5d28b97eb8adbd5278b995bb1b12db 100644 (file)
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -69,8 +69,6 @@
 /* SHA hashing */
 #define CONFIG_CMD_HASH
 #define CONFIG_HASH_VERIFY
-#define CONFIG_SHA1
-#define CONFIG_SHA256
 
 /* Enable Time Command */
 

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 7535ad5a62da5883681fac36fb4a0a16534706a8..809e70dbf03ee5db500cf2f74ea4b426f332064c 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -199,8 +199,6 @@
 #define CONFIG_SF_DEFAULT_MODE         0
 #endif
 
-#define CONFIG_SHA1
-
 /*
  * MMC
  */

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 7e606cd794ca7b0a2ec1d1abbfc45ae35b84e18d..e92327f8ef04a4fee629cef274444a7ea0dae77d 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -621,7 +621,6 @@
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 /*

diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 5411e5ff49f7d64d1848814c65474cd4cc82c7e3..f893b2e34784f39bf05bd004708d7644186a5b70 100644 (file)
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -26,7 +26,6 @@
 
 /* Enable ACE acceleration for SHA1 and SHA256 */
 #define CONFIG_EXYNOS_ACE_SHA
-#define CONFIG_SHA_HW_ACCEL
 
 /* Power Down Modes */
 #define S5P_CHECK_SLEEP                        0x00000BAD
@@ -139,8 +138,6 @@
 /* SHA hashing */
 #define CONFIG_CMD_HASH
 #define CONFIG_HASH_VERIFY
-#define CONFIG_SHA1
-#define CONFIG_SHA256
 
 /* Enable Time Command */
 

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 7ffc9d1dd988a1d3ff06e2803b58c0a4c8103757..17944a905817c0ff4c1ea37e91c9bd49157b5d39 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -542,7 +542,5 @@
 
 #define CONFIG_IMAGE_FORMAT_LEGACY
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA1
-#define CONFIG_SHA256
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index f783eac5dba37c0bf966ac7f20589be24d20900e..741bdfa80750e66d014005e17ab7f3afc9e3f899 100644 (file)
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -126,8 +126,6 @@
 /* FIT */
 #ifdef CONFIG_FIT
 # define CONFIG_HASH_VERIFY
-# define CONFIG_SHA1
-# define CONFIG_SHA256
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 

diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index a6394681d9923e7260c2bba1bc019ee76214b128..f52865b5a07dedb1e563a63439c99903e2c147e4 100644 (file)
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -108,8 +108,6 @@
 /* FIT */
 #ifdef CONFIG_FIT
 # define CONFIG_HASH_VERIFY
-# define CONFIG_SHA1
-# define CONFIG_SHA256
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 

diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 9f66dd324f950554d0fd30b619eea2e46ee9c647..2e12b977676ffb75a69362403d03e978dd8a0b63 100644 (file)
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -125,8 +125,6 @@
 /* FIT */
 #ifdef CONFIG_FIT
 # define CONFIG_HASH_VERIFY
-# define CONFIG_SHA1
-# define CONFIG_SHA256
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 

diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
index 5ce70ae4669c1a8dacea9ed9e658d16d26acddb2..76ae159da3c97e6c3b4df1289701b942c09cddc8 100644 (file)
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -125,8 +125,6 @@
 /* FIT */
 #ifdef CONFIG_FIT
 # define CONFIG_HASH_VERIFY
-# define CONFIG_SHA1
-# define CONFIG_SHA256
 # define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
 

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 35d17b96f4ab264939608f56d678301eeb08ac66..1b165157f7e290574830dd77f04d337008b76176 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -306,13 +306,8 @@
 #define CONFIG_MISC_INIT_R
 
 /* Hash command with SHA acceleration supported in hardware */
-
 #ifdef CONFIG_FSL_CAAM
-
 #define CONFIG_CMD_HASH
-
-#define CONFIG_SHA_HW_ACCEL
-
 #endif
 
 #include <asm/fsl_secure_boot.h>

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 333bb2662384931111ace10e67d32c18addeec8b..2de01444814e30ddc5ed4ba92fe13fede0055a1f 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -573,7 +573,6 @@ unsigned long get_board_ddr_clk(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #include <asm/fsl_secure_boot.h>

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 81f38a30a473c5447010bb4aaceb8d4c7181da9a..14534ecd1b0c0fc08ccb235a1a24321579fa1114 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -437,7 +437,6 @@
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #include <asm/fsl_secure_boot.h>

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index e26924877d10b55d72e0dc9e50032cf48edd9996..0522d1e9d72764f11c8a2fe32eea7a62ab39998e 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -304,7 +304,6 @@
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #endif /* __LS1043A_COMMON_H */

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 957ffd36347f982ba6bade01e05b92cd46a93fc1..da1e860de33485391fe589bc0000f73eb54858a4 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -233,7 +233,6 @@
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #endif /* __LS1046A_COMMON_H */

diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 427f623e8c52f395b658a826d65d4b87c20d1586..512eed8bdcab66d5a15f5748f176cb6dd0eef6cd 100644 (file)
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -233,7 +233,6 @@ unsigned long long get_qixis_addr(void);
 /* Hash command with SHA acceleration supported in hardware */
 #ifdef CONFIG_FSL_CAAM
 #define CONFIG_CMD_HASH
-#define CONFIG_SHA_HW_ACCEL
 #endif
 
 #endif /* __LS2_COMMON_H */

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 37c6132b8afa4eb5231387a12b85d65ab0a1229d..8ba37fc2455f6f7c1d817a71fcb2cefa8a308744 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -104,8 +104,6 @@
 
 #define CONFIG_CMD_HASH
 #define CONFIG_HASH_VERIFY
-#define CONFIG_SHA1
-#define CONFIG_SHA256
 
 #define CONFIG_CMD_SANDBOX
 

diff --git a/include/image.h b/include/image.h
index 800426d51f9636f8fed7d1cad0935218eeedc60b..8d380e0e848009cbfbe37c9799707f81ced3a88a 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -30,6 +30,8 @@ struct lmb;
 #define IMAGE_ENABLE_OF_LIBFDT 1
 #define CONFIG_FIT_VERBOSE     1 /* enable fit_format_{error,warning}() */
 #define CONFIG_FIT_ENABLE_SHA256_SUPPORT
+#define CONFIG_SHA1
+#define CONFIG_SHA256
 
 #define IMAGE_ENABLE_IGNORE    0
 #define IMAGE_INDENT_STRING    ""
@@ -65,8 +67,6 @@ struct lmb;
 #  endif
 # else
 #  define CONFIG_CRC32         /* FIT images need CRC32 support */
-#  define CONFIG_SHA1          /* and SHA1 */
-#  define CONFIG_SHA256                /* and SHA256 */
 #  define IMAGE_ENABLE_CRC32   1
 #  define IMAGE_ENABLE_MD5     1
 #  define IMAGE_ENABLE_SHA1    1
@@ -86,7 +86,6 @@ struct lmb;
 
 #if defined(CONFIG_FIT_ENABLE_SHA256_SUPPORT) || \
        defined(CONFIG_SPL_SHA256_SUPPORT)
-#define CONFIG_SHA256
 #define IMAGE_ENABLE_SHA256    1
 #else
 #define IMAGE_ENABLE_SHA256    0

diff --git a/lib/Makefile b/lib/Makefile
index 23e9f1ef11dbb50ceba3f60dc60a59bd5a7edd93..328b4a25c3a2d031b64075b53e204aac981ff9ce 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -44,9 +44,9 @@ obj-$(CONFIG_BITREVERSE) += bitrev.o
 obj-y += list_sort.o
 endif
 
-obj-$(CONFIG_$(SPL_)RSA) += rsa/
-obj-$(CONFIG_$(SPL_)SHA1) += sha1.o
-obj-$(CONFIG_$(SPL_)SHA256) += sha256.o
+obj-$(CONFIG_RSA) += rsa/
+obj-$(CONFIG_SHA1) += sha1.o
+obj-$(CONFIG_SHA256) += sha256.o
 
 obj-$(CONFIG_SPL_SAVEENV) += qsort.o
 obj-$(CONFIG_$(SPL_)OF_LIBFDT) += libfdt/