From patchwork Wed Aug 21 06:20:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po Liu X-Patchwork-Id: 268702 X-Patchwork-Delegate: yorksun@freescale.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 591BD2C00C9 for ; Wed, 21 Aug 2013 17:13:09 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 755B44A023; Wed, 21 Aug 2013 09:13:06 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 BvTRuveCL5n9; Wed, 21 Aug 2013 09:13:06 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1BEE54A05E; Wed, 21 Aug 2013 09:13:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 906DD4A062 for ; Wed, 21 Aug 2013 08:23:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 s0T9P04rAah2 for ; Wed, 21 Aug 2013 08:23:16 +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 co1outboundpool.messaging.microsoft.com (co1ehsobe003.messaging.microsoft.com [216.32.180.186]) by theia.denx.de (Postfix) with ESMTPS id 47A4C4A05E for ; Wed, 21 Aug 2013 08:23:10 +0200 (CEST) Received: from mail213-co1-R.bigfish.com (10.243.78.231) by CO1EHSOBE001.bigfish.com (10.243.66.64) with Microsoft SMTP Server id 14.1.225.22; Wed, 21 Aug 2013 06:23:06 +0000 Received: from mail213-co1 (localhost [127.0.0.1]) by mail213-co1-R.bigfish.com (Postfix) with ESMTP id C412FD800E7 for ; Wed, 21 Aug 2013 06:23:05 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz1de098h8275bh1de097hz2dh2a8h839he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h16a6h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dc1h1de2h1dfeh1dffh1e23h1fe8h1ff5h1155h) Received: from mail213-co1 (localhost.localdomain [127.0.0.1]) by mail213-co1 (MessageSwitch) id 1377066128244266_19485; Wed, 21 Aug 2013 06:22:08 +0000 (UTC) Received: from CO1EHSMHS021.bigfish.com (unknown [10.243.78.230]) by mail213-co1.bigfish.com (Postfix) with ESMTP id CDC284C0052 for ; Wed, 21 Aug 2013 06:21:49 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS021.bigfish.com (10.243.66.31) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 21 Aug 2013 06:21:49 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.146.2; Wed, 21 Aug 2013 06:21:48 +0000 Received: from localhost (rock.ap.freescale.net [10.193.20.106]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r7L6Lkxb009701; Tue, 20 Aug 2013 23:21:47 -0700 From: Po Liu To: Date: Wed, 21 Aug 2013 14:20:21 +0800 Message-ID: <1377066021-16181-1-git-send-email-Po.Liu@freescale.com> X-Mailer: git-send-email 1.8.0 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-Mailman-Approved-At: Wed, 21 Aug 2013 09:13:00 +0200 Cc: scottwood@freescale.com, Po Liu Subject: [U-Boot] [PATCH] powerpc: add CONFIG_SECURE_BOOT condition into fsl_secure_boot.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch is for board config file not to add CONFIG_SECURE_BOOT condition for include the asm/fsl_secure_boot.h. Signed-off-by: Po Liu --- arch/powerpc/include/asm/fsl_secure_boot.h | 2 ++ include/configs/B4860QDS.h | 2 -- include/configs/P1010RDB.h | 2 -- include/configs/P2041RDB.h | 2 -- include/configs/T4240QDS.h | 2 -- include/configs/corenet_ds.h | 2 -- 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index c36f3c3..4c7f0b1 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -7,6 +7,7 @@ #ifndef __FSL_SECURE_BOOT_H #define __FSL_SECURE_BOOT_H +#ifdef CONFIG_SECURE_BOOT #if defined(CONFIG_FSL_CORENET) #define CONFIG_SYS_PBI_FLASH_BASE 0xc0000000 #else @@ -15,3 +16,4 @@ #define CONFIG_SYS_PBI_FLASH_WINDOW 0xcff80000 #endif +#endif diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2f0bc6b..aa62d94 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -841,8 +841,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTCOMMAND CONFIG_LINUX -#ifdef CONFIG_SECURE_BOOT #include -#endif #endif /* __CONFIG_H */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ba3f7c2..c058613 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -759,8 +759,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND -#ifdef CONFIG_SECURE_BOOT #include -#endif #endif /* __CONFIG_H */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 905bacf..2f27e16 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -746,8 +746,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTCOMMAND CONFIG_HDBOOT -#ifdef CONFIG_SECURE_BOOT #include -#endif #endif /* __CONFIG_H */ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 92a30ab..590799c 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -553,8 +553,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BOOTCOMMAND CONFIG_LINUX -#ifdef CONFIG_SECURE_BOOT #include -#endif #endif /* __CONFIG_H */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index c3fb80c..966b0ab 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -745,8 +745,6 @@ #define CONFIG_BOOTCOMMAND CONFIG_HDBOOT -#ifdef CONFIG_SECURE_BOOT #include -#endif #endif /* __CONFIG_H */