From patchwork Wed Aug 24 16:51:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 662379 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sKD233Nswz9t1L for ; Thu, 25 Aug 2016 02:55:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=Ms5RNfpC; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 13B79A762D; Wed, 24 Aug 2016 18:54:21 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dcsja0DJRu_P; Wed, 24 Aug 2016 18:54:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0228EA7689; Wed, 24 Aug 2016 18:54:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CD682A7624 for ; Wed, 24 Aug 2016 18:53:20 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CCOoKrRaENpF for ; Wed, 24 Aug 2016 18:53:20 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-it0-f44.google.com (mail-it0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id B4105A763F for ; Wed, 24 Aug 2016 18:53:10 +0200 (CEST) Received: by mail-it0-f44.google.com with SMTP id f6so44474702ith.0 for ; Wed, 24 Aug 2016 09:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ieNJY0Lm38hm7laef/p0PQt0REE/pSf3jM0aCGwg7Gs=; b=Ms5RNfpCfokcfZP5tsBZhey4SmVSwDx/Nd/smp8cCfDunA71xEriR3lU+jzVC/zHuq bwtkpDZyEshtjzdCcX98hGhypxrNi7nACYe6EZjj+mS6puAVmN/STgWRZAIdVPxrnwPJ AXmkxZvL3/+JGn1UQ+BQXXmv0P8akcHMnGFofBmzyxj7se2cwnx+ncm34sVuVgpbpzv8 zIV+XLWTYIcfruoL+uvlA2U/+L+SpL0d7M87xM79IEc8hiJHBgYPhjzh11I0oVt0vUVP tRL65ciugn98do4VoSLnXerzeKcnm7VmblFwo2zXrgh8xKBA9VUUeR8PWeQYHE/AUtgr XIMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ieNJY0Lm38hm7laef/p0PQt0REE/pSf3jM0aCGwg7Gs=; b=iv8Db0fs9htT7pXha8pePSBMnZV7Neyh3ibZcxav0S3KJZleC2LazrSWvk+C2s0An+ KM9vgukvyIxW8hOlylDy/uWE23ix/CrVQMx9MG6X59kxpfCoNUy0Ow1OG2Lto2OXytPU 2YiBNQO85jkOHqm2N2zNXKk5sYHrX2+cusyse0pADWPPhd6QIDWyu0Ui38n/992TeWdv zBNLaffpayVDaghjGWbk5qkxUAyGY7T7MvdmUOuEmyGLEfr25du/VNZs/pPplkUkvPBT lrx4D8Yh6eM/SYbE6m9fnvahl6NCam4rZ4sfDaHVYfBjxOFJnCh1kQ8C2AhPlmzWNiex lobw== X-Gm-Message-State: AEkoouv4qNoddg7mbJtLu4qxMjqRsxPsglAMTpjtnX+Z0Fxwv7S6n3AN8Us5VioNVV+ka9SL X-Received: by 10.36.19.209 with SMTP id 200mr1476548itz.83.1472057588672; Wed, 24 Aug 2016 09:53:08 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.202.55]) by smtp.gmail.com with ESMTPSA id h63sm11978760ita.12.2016.08.24.09.53.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 09:53:05 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id D1D06224002; Wed, 24 Aug 2016 10:52:59 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 24 Aug 2016 10:51:56 -0600 Message-Id: <1472057546-10360-13-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1472057546-10360-1-git-send-email-sjg@chromium.org> References: <1472057546-10360-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , Alison Wang , Saksham Jain , Ruchika Gupta , Aneesh Bansal Subject: [U-Boot] [PATCH 12/42] Convert CONFIG_SPL_HASH_SUPPORT to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass --- arch/arm/include/asm/fsl_secure_boot.h | 1 - arch/powerpc/include/asm/fsl_secure_boot.h | 1 - configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 1 + configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index b9aad04..ddc77a5 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 8fa1908..ae50b86 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 ec92872..1b6493a 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 1866cb9..df1f959 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