diff options
author | Simon Glass <sjg@chromium.org> | 2017-05-17 09:25:25 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-22 16:38:15 (GMT) |
commit | 551c3934466503e6c8702df412e2a9ce574557e9 (patch) | |
tree | 921eea1da5d7230786e19ae3e31b8d466af08d60 /include | |
parent | 520f556d0d6fac7bc442095815c4ba68efb719ca (diff) | |
download | u-boot-fsl-qoriq-551c3934466503e6c8702df412e2a9ce574557e9.tar.xz |
Convert CONFIG_CMD_HASH to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_HASH
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Rework slightly, enable on some boards again]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
26 files changed, 0 insertions, 114 deletions
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 2c633e6..3c238d9 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_HASH /* calculate hash / digest */ #define CONFIG_CMD_IDE /* IDE harddisk support */ #define CONFIG_CMD_IMMAP /* IMMR dump support */ #define CONFIG_CMD_IO /* Access to X86 IO space */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 9eee5b7..6908cb4 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -709,11 +709,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * USB */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 19ab84e..fba25fb 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -326,11 +326,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 933a156..32a58e3 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -523,11 +523,6 @@ combinations. this should be removed later #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index ff46db4..64f23e0 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -439,11 +439,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 8a524b6..956403a 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -733,11 +733,6 @@ extern unsigned long get_sdram_size(void); || defined(CONFIG_FSL_SATA) #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 56126fb..7e7e56d 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -603,11 +603,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 97dd782..4992e8f 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -863,11 +863,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTCOMMAND CONFIG_LINUX -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #include <asm/fsl_secure_boot.h> #endif /* __T1024QDS_H */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index e5f03cc..709e6bb 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -882,11 +882,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTCOMMAND CONFIG_LINUX -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #include <asm/fsl_secure_boot.h> #endif /* __T1024RDB_H */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 58cbe6b..11772da 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -665,11 +665,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 9daad21..fa6d9f4 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -778,11 +778,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 72e63df..af0dada 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -751,11 +751,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 698afd1..fdafeeb 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -696,11 +696,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_PCI #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 28476c4..dc3ebfa 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -498,11 +498,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * USB */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 19b331b..ad7802a 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -695,11 +695,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #define __USB_PHY_TYPE utmi diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index d264e1c..957cd9e 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -67,7 +67,6 @@ #define CONFIG_FAT_WRITE /* SHA hashing */ -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY /* Enable Time Command */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 6dc65b3..07180aa 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -617,11 +617,6 @@ #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index f4a56f2..6915dc1 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -41,8 +41,6 @@ /* select serial console configuration */ #define EXYNOS5_DEFAULT_UART_OFFSET 0x010000 -#define CONFIG_CMD_HASH - /* Thermal Management Unit */ #define CONFIG_EXYNOS_TMU @@ -134,7 +132,6 @@ #endif /*CONFIG_CMD_NET*/ /* SHA hashing */ -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY /* Enable Time Command */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 69e2b9e..f833528 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -540,6 +540,5 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 #define CONFIG_IMAGE_FORMAT_LEGACY -#define CONFIG_CMD_HASH #endif /* __CONFIG_H */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 1b16515..d6839c0 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -305,11 +305,6 @@ #define CONFIG_MISC_INIT_R -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #include <asm/fsl_secure_boot.h> #endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 2de0144..a27d70e 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -570,11 +570,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_MISC_INIT_R -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #include <asm/fsl_secure_boot.h> #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 14534ec..60c3d5d 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -434,11 +434,6 @@ #define CONFIG_MISC_INIT_R -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #include <asm/fsl_secure_boot.h> #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 4758c55..b35f96d 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -298,9 +298,4 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #endif /* __LS1043A_COMMON_H */ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 98b00ed..1fbafaa 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -227,9 +227,4 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #endif /* __LS1046A_COMMON_H */ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index ed7d1d7..285e48d 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -229,9 +229,4 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#endif - #endif /* __LS2_COMMON_H */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 9d69fa2..5175c2e 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -100,9 +100,6 @@ #define CONFIG_BOOTP_SERVERIP #define CONFIG_IP_DEFRAG -/* Can't boot elf images */ - -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY #define CONFIG_CMD_SANDBOX |