From patchwork Tue Sep 13 05:18:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 669162 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 3sYCjK0409z9sRZ for ; Tue, 13 Sep 2016 15:22:13 +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=DZVNU2hf; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C193C4BB1A; Tue, 13 Sep 2016 07:21:04 +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 d-JnMhQiz6eA; Tue, 13 Sep 2016 07:21:04 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 853C4A756B; Tue, 13 Sep 2016 07:20:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ACB1FA7574 for ; Tue, 13 Sep 2016 07:19:35 +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 5HAH3yk8dhVe for ; Tue, 13 Sep 2016 07:19:35 +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-oi0-f52.google.com (mail-oi0-f52.google.com [209.85.218.52]) by theia.denx.de (Postfix) with ESMTPS id 4DAA04BA81 for ; Tue, 13 Sep 2016 07:19:28 +0200 (CEST) Received: by mail-oi0-f52.google.com with SMTP id m11so361575105oif.1 for ; Mon, 12 Sep 2016 22:19:28 -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=J6LS+kJX48NCx71maw2XdgK8OozDy3uKC9One6FSMHs=; b=DZVNU2hfiql08H7FfLAGngrOONSfC1SXkOcAnGW3x8Nz2cywQVyW1ro5EPPok2/GpH 7lyZLScc2rtiYDxu88bHorVdt7N/VY8thzPLURtPHkQbnl0CuFA3SdUNhvg6u2rLmL8x mGGNNwA2gtoPdVW2u6+29Jay0Xkvr0jIup0CcEbds6mjD9v3274KWGgef+i1Eb1CzHAU SaO25VcNmbNHBD85Z2wwVvwBKR6dttFKAvfzT2ed0JuXJt68UTp1LMV/pvh4OGix56cF z+/lnZ0ddOJqNiXs0j9qfjmze7ZZid2m8VGxG1/at+peshhIdWVXbVipQqzJyxf6h7WP ct6A== 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=J6LS+kJX48NCx71maw2XdgK8OozDy3uKC9One6FSMHs=; b=l1bzoYOaRSPELS3FCxrdEK7IxtjfvtlEPsq3ifkxvFIAXUqotMVOJwspv/wQbgE3B6 /SMS1/4zEg0aWBghIha02+T9MnH4qkGqjDDSrNV2iUtrlJu00DAot5N6jwwAxJ9cwotg ogqQjHOctfEymbTZ+i4PsTE9C/JDWgX9tEFGpxEDFdsYn0evcOqITKA52iNMFMhhhl5l YprZSaxp1UQXnB0VllzDS6nTkj+/5BXymzFdn/G/kCq4HXhTX5+nQif19hQLJd0sZD37 BYzmnhmwAt8SciMJG6NFsNEfMmHV6vRA1QjVs44Bb75xCk9klz5G9SDWbJ16fdTiqhfj A6Bw== X-Gm-Message-State: AE9vXwNdrHwCASCa4EBBVoDWjeF3LTxF0ypDNghNKAOUzruKqjqKCz9LVZJ3Lr6ZGJFrpxDm X-Received: by 10.202.253.206 with SMTP id b197mr4783587oii.137.1473743967447; Mon, 12 Sep 2016 22:19:27 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:12:30be:bb2b:5a2a:a5ee]) by smtp.gmail.com with ESMTPSA id e12sm2797274iod.12.2016.09.12.22.19.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 22:19:26 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id D40AA2240EE; Mon, 12 Sep 2016 23:19:19 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 12 Sep 2016 23:18:32 -0600 Message-Id: <1473743943-15003-15-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1473743943-15003-1-git-send-email-sjg@chromium.org> References: <1473743943-15003-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH v3 14/45] 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 --- Changes in v3: None Changes in v2: None 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 5f6c84b..cbc7083 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 e6e4f82..3316efa 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