Message ID | 1453023576-17845-7-git-send-email-aneesh.bansal@nxp.com |
---|---|
State | Superseded |
Delegated to: | York Sun |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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 370AC140779 for <incoming@patchwork.ozlabs.org>; Sun, 17 Jan 2016 20:43:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DD3A2A758E; Sun, 17 Jan 2016 10:42:46 +0100 (CET) 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 uZ22R_w9aT49; Sun, 17 Jan 2016 10:42:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 73258A7851; Sun, 17 Jan 2016 10:42:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5EDA7A7579 for <u-boot@lists.denx.de>; Sun, 17 Jan 2016 10:42:28 +0100 (CET) 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 dUVb5M6MQ0_F for <u-boot@lists.denx.de>; Sun, 17 Jan 2016 10:42:28 +0100 (CET) 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 na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0092.outbound.protection.outlook.com [157.56.111.92]) by theia.denx.de (Postfix) with ESMTPS id 0C6A8A7820 for <u-boot@lists.denx.de>; Sun, 17 Jan 2016 10:42:23 +0100 (CET) Received: from DM2PR03CA0037.namprd03.prod.outlook.com (10.141.96.36) by DM2PR0301MB0750.namprd03.prod.outlook.com (10.160.97.146) with Microsoft SMTP Server (TLS) id 15.1.361.13; Sun, 17 Jan 2016 09:42:21 +0000 Received: from BY2FFO11FD050.protection.gbl (2a01:111:f400:7c0c::179) by DM2PR03CA0037.outlook.office365.com (2a01:111:e400:2428::36) with Microsoft SMTP Server (TLS) id 15.1.365.19 via Frontend Transport; Sun, 17 Jan 2016 09:42:21 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD050.mail.protection.outlook.com (10.1.15.187) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Sun, 17 Jan 2016 09:42:20 +0000 Received: from perf-idc04.ap.freescale.net (perf-idc04.ap.freescale.net [10.232.14.49]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u0H9fseA028685; Sun, 17 Jan 2016 02:42:18 -0700 From: Aneesh Bansal <aneesh.bansal@nxp.com> To: <u-boot@lists.denx.de> Date: Sun, 17 Jan 2016 15:09:35 +0530 Message-ID: <1453023576-17845-7-git-send-email-aneesh.bansal@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1453023576-17845-1-git-send-email-aneesh.bansal@nxp.com> References: <1453023576-17845-1-git-send-email-aneesh.bansal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130974973410864362; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD050; 1:WFErmpuE763CPwb2HqqAdRcIpQEk13oCW26h7SvXf7dVTcaaRNh0R6YHdPVTiwyShk4MhA1cK3w8/M8O0hOkW10+JHXIN9c07GhHRGNsZuhb2BilhEaspXwyXDYw19H+M/q5SuLxjkGpN5Gi4/wKhTfrLI9FNw6eja5yRdm0kV7ihAOA2iw/eb272bjWQBhqb8qzu3RHOdre2KTIMLVZx5qCJtR2vHePoYB86keuxX/2Ntvd4YG0ePrBanjzPTU2PzgUwhsxQX7yYogGdoXaHkL8qAl21NoLMehsdytmpaRaMb6Fz/B248P7vQ+1UgViakTihud7jsYG72suknvSIRQcLiXgPuoVnEqCWGHnI5lFdjMx4mmNDRbUwhrqfvIYPrr1WYowzrA0yTZitthRV8lTx8dXzCao7K8HjontffZRcv7a0Al63O6L9QTMJVlyogl7+PLbNw9mJJaTqYGbKbMUU8RIsEUmXWzB35p9TL0= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(586003)(5003940100001)(19580405001)(48376002)(2950100001)(50466002)(19580395003)(36756003)(2351001)(229853001)(50226001)(5001960100002)(106466001)(2906002)(92566002)(189998001)(77096005)(104016004)(11100500001)(47776003)(97736004)(1220700001)(86362001)(105606002)(1096002)(76176999)(5008740100001)(33646002)(81156007)(4326007)(50986999)(87936001)(110136002)(85426001)(6806005)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0750; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 2:XerexfS4f4XuUvwacqBlgqAEUQdeXSIHkZ3mX3RuM7STvxj2GedF+BuVuNrnu03r4gtnADc7bEW2VSNhb++btYxaUcpnpkSFKB7cuWxunUhdNBbe3ke7VbTybiMAj5/Vhyq/1hY4k096mg1eIzQtgg==; 3:tJb18lHCfvIXHoomKiGVXvfs72WAFHfYtCckQXwkI5MIdG26+mXuxuX/Zw2OpX/yXnqM5eE9WacDXMP4MIA4JGkAA9FIyrOZJh1Cj6Z9gJ/0w+RTvbvrH3tmmyFz72T0E/lYWwpsOD6SRC6BhiAH7vDCtPpCkJG0AgPbpxWMgz+UhVzHoLthevljyA6Ui+2hA3eQqJsa/vgyleACz5YhF1MKRMmlYV+R9ccz8z+TglU=; 25:O3OCEryg7tb3UxIe4fxWdLGvHm+DJ/7ahN1BNlVZJw5lhOXuSkUbPYfV8c5LnX2Wuy6mxljR6IE96TQSSkK3P4yZzf62ieMIfHt0JBdiQY3jVVjATgem3IR5n6eCaqumnquirJvXIa/x94/REA64mN4cx9eDoivtltS7K/IagbCiaw7bKtTWu+7O+HjDF6rVSSWKzo+kf23+wIIhIRTExIM/Dw2B0vH52/dhlcfsY+9JTxI0oyeswBuPGT1m8DsH X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0750; X-MS-Office365-Filtering-Correlation-Id: b6c37958-c8b8-4512-ecea-08d31f227f15 X-Microsoft-Antispam-PRVS: <DM2PR0301MB075061EAAF0BC4B8EF6D38F5FACF0@DM2PR0301MB0750.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(13017025)(13015025)(8121501046)(520078)(13018025)(10201501046)(3002001); SRVR:DM2PR0301MB0750; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0750; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 4:x8eebQUeKJXnutTe++HqXP0WF6sJE9wyXgN6UY6Ys3yPFOwWSuKIfHSlaDvZ4WnVxXgvuziHY/1CG3i3vVAiga8/Eqf1/mziH/WEvgAACmi5APlhzPOb3LPKSdFobtUD5FlEsY1DoKS7xwqnbIcWJ/7LbE5IyJzHTr/UNGdR/wqECHi9savYUZNUTGQ5mmXhgyBOEBY9cauV7N0zLXgPVzGglkJgXs7NUfAA+h5pFWBmRIiwFhCTLwrNwQaEo9eFM3zQq2vLEclgAcD3fZ8YUw5MGkgpDtExeRcNCRhM4SCRh1nRaNYmc42KO23VcBg8jU7lh7P55m+vkn9YTfkawCOHum0B8A1lrupuW7ginW+jmAAwHOIZI42j4v7i4arHYe3Xg5VJI5KinlkxqCiVWWSAFy/2IWTr7s/fOb5DPsd7dOZlML2yiAvPzZINrvagu225LoANOrf3q7Pv6r/H8pY+DAHpsXwfd1xPULKWuAc= X-Forefront-PRVS: 082465FB26 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0750; 23:As5pMpkCAl/yXjx9vQaK7ZCF59nEW06Jq+OqHYb?= =?us-ascii?Q?ydWNoheHxmZ8m+li69I58Gk9InImpwg4R/2mUbmf/lBXdzVxYmeyXNZvxL8w?= =?us-ascii?Q?DUJdtb5DsFCVRePGHt8qAemEzLWnHQaCFzvR/y0o/8tQybdsbts/ZmLN7akl?= =?us-ascii?Q?NgOyP2ApQhUpjpPrQ1Aytdgo9405zq2bR5izfD4Z9HtFZGLavCvw4K4nBlwK?= =?us-ascii?Q?Fe24oANnV6jmR/Y4vjg65lOZzrVzlcRQjYcrCMyNkTYzEHnd6dIpHipyMS6D?= =?us-ascii?Q?7xUXl77JJEIQp+Ww9xN0nkZDt6mbeAJemG7l4v/W2xXfBB2GuQTZMnKo/ih4?= =?us-ascii?Q?D9z/3UAKV49/Fk8swo0lWaQb29y1hyT8KZIpe8Rp7cBzx7hkFUxb02+XyW0r?= =?us-ascii?Q?V4odQqITKb7ZASCMe1Mxb4ATZxaZaIvB5LLt9A3Juc8Qixie1/28c+UmK/v1?= =?us-ascii?Q?uOn9DSrsRHxRVpBpP6ma7/fRxb/mwH/8XH0Wy63YYmVSrkS8xDKKZ/oMFfHb?= =?us-ascii?Q?L0zLZzYPBoKhvkQLBgv0igiazFyRk0V0mdEWMsfWM/m/DbiW+AhN9e19J4Yw?= =?us-ascii?Q?QtALdPOhiDafzXZo7dFdqWQE32mlacvZAB+TkUszVPrySidUK9iTcFYf2fYR?= =?us-ascii?Q?7WBp+x0nLmtXSAcHj+tO5Zi2mPDSg9UDYtPWgzQOH6GIapJ92CDNibB2H+Hk?= =?us-ascii?Q?ZfaBpWm5iukgj0Ta0CabyaH8wx05GYKNUEMdbPIzSAdw7eHn17T3nlIEXR5t?= =?us-ascii?Q?XlG+1a+ihFL6qkL6I0X9Hoc29v8zleG+dDsvTXUn0up+roHNxLqIsfhQNcBp?= =?us-ascii?Q?uWlfKMhkAgeQSydptqhrrUDx/DsKBfzQKO2J40OlBG+srxcczFHJC3JxPuUv?= =?us-ascii?Q?R+91P254jMioTsksB7Cm+AvSAfvZOW/LOB138bkmHBUQ5BEvmGew3HuqeWlU?= =?us-ascii?Q?FWTe2CtZKfrlmMcmuSwm1CPtyhLT883SC3vpNqG2fCKfGLmT2f873oVWG8tG?= =?us-ascii?Q?UzxuoNruKfH0NWVd376F7HNG0LNpFwk9VQBZBygpXrJTAHURSV7lOWzjc16V?= =?us-ascii?Q?4eFGgUsYGxLUUjx+TxwFxTb7/FhkVIhvtpBHX6Om0pbSz3P3qEbqZPoJEjPP?= =?us-ascii?Q?gg7sop/Engqw=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 5:yGQyb3EiJFnDTOc2F/WBNs8xKnzCXRpeAso6KfBvhD4orGY3sExyGEwsCXim0mU+ID743Fz5nfnNK0vYpuvO3QGTC3uU1mjIzq0oOJeUfJg4IfPfdvw7+4DeLq/BGYj5KETeJUJRrtCZgN9OASTLDBlRzKEMGjpFN7RHtPxfzkY=; 24:e8qoXYNN3vdnn3kqDEIEXUlYgH109JvQT0tEb9QL/Rj225akvmH3aYa9syc1Im5LUqs0j7lfOPHAi2FRFhq8SvDpvbqaZFjp5i5EAe/+cac= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2016 09:42:20.8836 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0750 Cc: ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH v2 6/7] enable chain of trust for PowerPC platforms X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 50bb86a..a797980 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -26,6 +26,7 @@ #include <fsl_usb.h> #include <hwconfig.h> #include <linux/compiler.h> +#include <fsl_validate.h> #include "mp.h" #ifdef CONFIG_FSL_CAAM #include <fsl_sec.h> @@ -1011,3 +1012,14 @@ void cpu_secondary_init_r(void) qe_reset(); #endif } + +#ifdef CONFIG_BOARD_LATE_INIT +int board_late_init(void) +{ +#ifdef CONFIG_CHAIN_OF_TRUST + fsl_setenv_chain_of_trust(); +#endif + + return 0; +} +#endif diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 41058d1..c45cace 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -87,6 +87,13 @@ #define CONFIG_FSL_CAAM #endif +/* fsl_setenv_chain_of_trust() must be called from + * board_late_init() + */ +#ifndef CONFIG_BOARD_LATE_INIT +#define CONFIG_BOARD_LATE_INIT +#endif + /* If Boot Script is not on NOR and is required to be copied on RAM */ #ifdef CONFIG_BOOTSCRIPT_COPY_RAM #define CONFIG_BS_HDR_ADDR_RAM 0x00010000
Chain of Trust is enabled for PowerPC platforms for Secure Boot. CONFIG_BOARD_LATE_INIT is defined. In board_late_init(), fsl_setenv_chain_of_trust() is called which will perform the following: - If boot mode is non-secure, return (No Change) - If boot mode is secure, set the following environmet variables: bootdelay = 0 (To disable Boot Prompt) bootcmd = CONFIG_CHAIN_BOOT_CMD (Validate and execute Boot script) Signed-off-by: Aneesh Bansal <aneesh.bansal@nxp.com> --- Changes in v2: None (Changed the Sign-Off with New E-Mail ID) arch/powerpc/cpu/mpc85xx/cpu_init.c | 12 ++++++++++++ arch/powerpc/include/asm/fsl_secure_boot.h | 7 +++++++ 2 files changed, 19 insertions(+)