diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-15 12:17:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-22 08:36:58 -0400 |
| commit | 089df18bfe9dd6e98f34807247ec77e0e1b5f7a2 (patch) | |
| tree | b8e2a2fa03586d1f08bf58eea9645d0f9a3b50fd /include/configs | |
| parent | 0db7f6859fef41c1e95bcef75761054a01782d1b (diff) | |
| download | u-boot-089df18bfe9dd6e98f34807247ec77e0e1b5f7a2.tar.gz | |
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 <poonam.aggrwal@freescale.com>
Cc: Naveen Burmi <NaveenBurmi@freescale.com>
Cc: Po Liu <po.liu@freescale.com>
Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Cc: Priyanka Jain <Priyanka.Jain@freescale.com>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: Chunhe Lan <Chunhe.Lan@freescale.com>
Cc: Chander Kashyap <k.chander@samsung.com>
Cc: Steve Rae <steve.rae@raedomain.com>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: Feng Li <feng.li_2@nxp.com>
Cc: Alison Wang <alison.wang@freescale.com>
Cc: Sumit Garg <sumit.garg@nxp.com>
Cc: Mingkai Hu <Mingkai.Hu@freescale.com>
Cc: York Sun <york.sun@nxp.com>
Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Akshay Saraswat <akshay.s@samsung.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
30 files changed, 0 insertions, 44 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2041b7bb3e..e94ac5ea2c 100644 --- 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 72dc8ba710..bce6229496 100644 --- 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 1b956fc7da..b303b4b51b 100644 --- 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 f95c3b9eeb..b8c823cc56 100644 --- 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 867004fb48..ce32f431fc 100644 --- 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 7629fe8eb4..66c1bba2f4 100644 --- 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 42e692c4a0..94828931ae 100644 --- 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 c2175bda34..373cb2a81c 100644 --- 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 25658871e4..0ae9eda463 100644 --- 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 d2ece40d4a..b3d595709e 100644 --- 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 02fd37d5cb..a426da40d7 100644 --- 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 faa1111e9f..315067332b 100644 --- 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 5d030d1179..28476c4f2f 100644 --- 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 8ebfde19f9..ba725d21e5 100644 --- 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 d9b88fa2d3..d264e1c77b 100644 --- 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 7535ad5a62..809e70dbf0 100644 --- 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 7e606cd794..e92327f8ef 100644 --- 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 5411e5ff49..f893b2e347 100644 --- 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 7ffc9d1dd9..17944a9058 100644 --- 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 f783eac5db..741bdfa807 100644 --- 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 a6394681d9..f52865b5a0 100644 --- 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 9f66dd324f..2e12b97767 100644 --- 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 5ce70ae466..76ae159da3 100644 --- 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 35d17b96f4..1b165157f7 100644 --- 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 333bb26623..2de0144481 100644 --- 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 81f38a30a4..14534ecd1b 100644 --- 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 e26924877d..0522d1e9d7 100644 --- 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 957ffd3634..da1e860de3 100644 --- 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 427f623e8c..512eed8bdc 100644 --- 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 37c6132b8a..8ba37fc245 100644 --- 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 |