From patchwork Tue Sep 13 05:18:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 669154 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 3sYCgH5Ybrz9sRZ for ; Tue, 13 Sep 2016 15:20:27 +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=dEAlj7UP; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A55C44BA35; Tue, 13 Sep 2016 07:20:01 +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 g5or2dtNuVcB; Tue, 13 Sep 2016 07:20:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7BA6FA7534; Tue, 13 Sep 2016 07:19:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1E1CFA7533 for ; Tue, 13 Sep 2016 07:19:29 +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 YwTyJFXLHfHv for ; Tue, 13 Sep 2016 07:19:29 +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-f53.google.com (mail-oi0-f53.google.com [209.85.218.53]) by theia.denx.de (Postfix) with ESMTPS id 29EFCA7548 for ; Tue, 13 Sep 2016 07:19:22 +0200 (CEST) Received: by mail-oi0-f53.google.com with SMTP id q188so246127824oia.3 for ; Mon, 12 Sep 2016 22:19:22 -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=euwUdrKJ/6IXtyDrlhcXo5DFX89Kl4N2HDH9L1qAzvo=; b=dEAlj7UPDKvO5/CaarjDwXGsDhvD6DHlecbY7Yp/TUcLK8GJprEx3Ma7D29TtNRwh8 1Q6sjTsYHItjWQdFGs9CMtjvBxToNDnLQ9KG/iBbYJZQnY3l6+cNoImKa2rT0bKoMnmu LYcaI1sz4/50piftkgxeYYq5EVDJowuuCbLfrUfVU+Fk4MBknig0bKDpKWwjgJmeHwc6 QU100PXG7oFjW86d+3paVlbz1iykAaYKsDu/s+WkV74cBYKO9y7m9oBWn0vFyNgDqLwa OCFuZryNx4+OkEHwhbmCHUKQ604+bQyQG2Xa94VSQoIHpTN3Fj24pcGKNsOiC3WTU4fz N62A== 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=euwUdrKJ/6IXtyDrlhcXo5DFX89Kl4N2HDH9L1qAzvo=; b=NyX16BartsnF6XY+vIlcEcb1pMSOwiyyJ3+PKEzlNlOnhe3MFXkHu3sba7nqDqlvhE oc289jVXruc6dqM2CEUnBRNpipiY7eLB4MNj6pC5qgWNlw76A4mlo1QYqWnao+kEHG+p nviM0MKKE72A4fyDqOT0Qhe/1uKrtddgfh3jNmUVAPJnc24YzGcX5Mj4HnVAHdWVArq7 rP6eW6X//vJvfmCra5/5/bYvcejbsAyiU5V+u9wiatdt4ZLYyEHIMF8XavKBwoAWF0d0 /fVVEUXayzp2zb+s3tLsWwsm+wQxDqmmxTb7gVtF4M5dG5fRf1sMZccgVNbKjZR5kFYT hQWw== X-Gm-Message-State: AE9vXwN6v7GaN3jqC9Q3IBnvpUAVusu0OA/4anwFmGKSBdEImrmBrG5YB4WClvPrW3TY+81Z X-Received: by 10.157.48.99 with SMTP id w32mr30413696otd.78.1473743960832; Mon, 12 Sep 2016 22:19:20 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.202.55]) by smtp.gmail.com with ESMTPSA id f14sm10793758ita.10.2016.09.12.22.19.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 22:19:19 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id DAA87222233; Mon, 12 Sep 2016 23:19:18 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 12 Sep 2016 23:18:23 -0600 Message-Id: <1473743943-15003-6-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 05/45] arm: fsl: Adjust ordering of #ifndef CONFIG_SPL_BUILD 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" The secure boot header files incorrectly define SPL options only if CONFIG_SPL_BUILD is defined. This means that the options are only enabled in an SPL build, and not with a normal 'make xxx_defconfig'. This means that moveconfig.py cannot work, since it sees the options as disabled even when they may be manually enabled in an SPL build. Fix this by changing the order. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: None arch/arm/include/asm/fsl_secure_boot.h | 2 +- arch/powerpc/include/asm/fsl_secure_boot.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index b35c271..1d379c7 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -26,13 +26,13 @@ #define CONFIG_FSL_CAAM #endif -#ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_DM 1 #define CONFIG_SPL_CRYPTO_SUPPORT #define CONFIG_SPL_HASH_SUPPORT #define CONFIG_SPL_RSA #define CONFIG_SPL_DRIVERS_MISC_SUPPORT +#ifdef CONFIG_SPL_BUILD /* * Define the key hash for U-Boot here if public/private key pair used to * sign U-boot are different from the SRK hash put in the fuse diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 2e937f0..01255d8 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -80,12 +80,13 @@ #ifdef CONFIG_CHAIN_OF_TRUST -#ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_DM 1 #define CONFIG_SPL_CRYPTO_SUPPORT #define CONFIG_SPL_HASH_SUPPORT #define CONFIG_SPL_RSA #define CONFIG_SPL_DRIVERS_MISC_SUPPORT + +#ifdef CONFIG_SPL_BUILD /* * PPAACT and SPAACT table for PAMU must be placed on DDR after DDR init * due to space crunch on CPC and thus malloc will not work.