From: Simon Glass Date: Tue, 13 Sep 2016 05:18:32 +0000 (-0600) Subject: Convert CONFIG_SPL_HASH_SUPPORT to Kconfig X-Git-Tag: v2016.11-rc1~165 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d3e7e2b2ce844ffe76eb658b05bb5cfc0be28efe;p=oweals%2Fu-boot.git Convert CONFIG_SPL_HASH_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass --- diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index b9aad049a7..ddc77a54da 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -27,7 +27,6 @@ #endif #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_HASH_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #ifdef CONFIG_SPL_BUILD /* diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 8fa19083a3..ae50b86fb2 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -80,7 +80,6 @@ #ifdef CONFIG_CHAIN_OF_TRUST -#define CONFIG_SPL_HASH_SUPPORT #define CONFIG_SPL_DRIVERS_MISC_SUPPORT #ifdef CONFIG_SPL_BUILD diff --git a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig index 5f6c84b7a4..cbc708329c 100644 --- a/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig +++ b/configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND,SEC CONFIG_BOOTDELAY=0 CONFIG_SPL=y CONFIG_SPL_CRYPTO_SUPPORT=y +CONFIG_SPL_HASH_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y CONFIG_CMD_MMC=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index e6e4f827b8..3316efa1b8 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SECURE_BOOT" CONFIG_BOOTDELAY=0 CONFIG_SPL=y CONFIG_SPL_CRYPTO_SUPPORT=y +CONFIG_SPL_HASH_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y