Message ID | 1454995422-31731-13-git-send-email-saksham.jain@nxp.com |
---|---|
State | Changes Requested |
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 E718D1409B7 for <incoming@patchwork.ozlabs.org>; Tue, 9 Feb 2016 17:23:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 226A9A7603; Tue, 9 Feb 2016 07:21:33 +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 Zv7DoBVo_ATP; Tue, 9 Feb 2016 07:21:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 14328A760D; Tue, 9 Feb 2016 07:20:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 30DF7A7519 for <u-boot@lists.denx.de>; Tue, 9 Feb 2016 06:27:35 +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 8IlR74AfNZ1c for <u-boot@lists.denx.de>; Tue, 9 Feb 2016 06:27:35 +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-bn1bon0064.outbound.protection.outlook.com [157.56.111.64]) by theia.denx.de (Postfix) with ESMTPS id 84CDBA74B4 for <u-boot@lists.denx.de>; Tue, 9 Feb 2016 06:27:29 +0100 (CET) Received: from BLUPR03CA010.namprd03.prod.outlook.com (10.255.124.27) by SN1PR0301MB2062.namprd03.prod.outlook.com (10.163.227.149) with Microsoft SMTP Server (TLS) id 15.1.396.15; Tue, 9 Feb 2016 05:27:27 +0000 Received: from BN1AFFO11FD012.protection.gbl (10.255.124.4) by BLUPR03CA010.outlook.office365.com (10.255.124.27) with Microsoft SMTP Server (TLS) id 15.1.403.16 via Frontend Transport; Tue, 9 Feb 2016 05:27:26 +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 BN1AFFO11FD012.mail.protection.outlook.com (10.58.52.72) with Microsoft SMTP Server (TLS) id 15.1.409.7 via Frontend Transport; Tue, 9 Feb 2016 05:27:26 +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 u195QmIR013485; Mon, 8 Feb 2016 22:27:23 -0700 From: Saksham Jain <saksham.jain@nxp.com> To: <u-boot@lists.denx.de> Date: Tue, 9 Feb 2016 10:53:40 +0530 Message-ID: <1454995422-31731-13-git-send-email-saksham.jain@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1454995422-31731-1-git-send-email-saksham.jain@nxp.com> References: <1454995422-31731-1-git-send-email-saksham.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130994692468121664; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD012; 1:hDHzjg4+0qdlAy+7J4KIYmXUcnBsN06LBY3A/KteHC6SI0D+k19P/9+C35oTTwsxSZWeO3/lTMVGXVl9ta5vTaCZiDeDgB4nxpKt5h0O3ph3PvHk5Zhb5YTBflSB/upOZvAwsKQ+fX5YeXg5nlci9HXpIdrmymMAYe87wXwaxjqpM0ZznQQq7GSBKjXP4chJv9mIYU13G4/wVRIj6Fzia6YSMIssRxw7naJR1pwHzgwEqHvNYt3sXpCNlsCtgbicBy3fzSF/LZydnsL4QVrZok2tOA6lmUPJJZbuqIFNEAO9v9ze63gaUEG2FPaC915CJeyBozEbYeoGL6BFOEHVv5rVB6hMrm2lDQB4y0kOkJLlMf9GWDuJZYVCsZ2mk8G087cVmCb/3jj93dJrqcTESwrgwzqKPXJKRGk3td9MXNpWMAejuOvCLDz9rdoQEPwa3xlfBmXqk2EWpH5MIAERJqje8ptfUgRDVzz8gvlWDTFJZg7zhoqWjYBzyOdZQfhTynkD67pgze8ZHg9dxYMVdAg65q71H7Yg9LeTdjiEwOkdf5VXy+XPkKAG0kdC55pzzJuppIbZnpeAyGZ1i0q9+A== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(189998001)(50986999)(575784001)(33646002)(50226001)(85426001)(36756003)(76176999)(48376002)(5003940100001)(87936001)(2351001)(229853001)(86362001)(4326007)(1096002)(5008740100001)(110136002)(50466002)(2906002)(92566002)(104016004)(6806005)(2950100001)(77096005)(47776003)(19580405001)(1220700001)(11100500001)(19580395003)(586003)(5001960100002)(106466001)(105606002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB2062; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 486660ab-f6b6-45b8-bee0-08d33111b27a X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2062; 2:YdHXoA9TLpCcKHta+bm3WmE+q/GqtwwmdzhLgC1PQ3dmWkE4QBHa10r1oFbu1wV9ZylJGynkuA3/rPH7SPDgbgJyjxu+cv3ObusZC+e/UA7YTTjHkXJxFv3sybBrqE7RDCNL/p5rJ3l3RX4q+5375/ocwfLatuosPYn8switKvjLMDpBMB3ASWK8AIiJexzP; 3:dMJGkFrGuiS642fGmB9OcOGnVzDC2ogi0vg3bUeo9XeaYQJ+u4VFdi+JkRC8hsew6d9Iuqi+pJ8uhQGurnW/vjF2cIZ8PgUsjHrjRLHR4IqNtFwlMO1q3denKwmrFHaJ73yRRe+pOV36rUKaYQtiIKyWZao88Cqc7rBcwyDffFkQcV87rM3Vu8Ou8fRgqTRGYjMMGoDDQc1gjrQnNSvDMNgaCak2Cfj3EIgW05DIHyc=; 25:yCdvOR8fKvE7BYgL79aowlWefnFfn2mstDaaniP8L7F66L/sgnf5h01o+JT2TtC3JT6YtbxtI9FsfWaVhCppWfbj2HpdP4HeDZnOGjuYOH+J7GmJtXhEZNd9mlWaVO30ZfPnV6sIlM6ci7RMk8NLylWGm6Df08soZ4ZWsVcxQ7IoE8dK8azT6HvsfiEWUSWNEt13cdEdeM+3IonFElQLwWM5EDUHYMZGpz2YPk0kJyO6i6tJLwY5tk4VjVpD0gMrgWVhNdXcScF0Q8Ar1evHeOUsmatHPaYgYjCleXmPpndMW/sfQ2y31/5RfmvnM+/K X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2062; X-Microsoft-Antispam-PRVS: <SN1PR0301MB2062F1EC9D5FCF2C450BD5E19FD60@SN1PR0301MB2062.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13017025)(13024025)(13018025)(5005006)(13015025)(13023025)(8121501046)(10201501046)(3002001); SRVR:SN1PR0301MB2062; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB2062; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2062; 4:STs8JCLEMFLb5sF5NGXvcmTuFDugjy0DBPb5We6H5leTVv4ZcU8mkYU30Me215+BQ5TH5Tzv+n+4Evd7h3Xi08BsUsRH1fT9NAfiF+uwANlGzgIhJDLed0fNMHKEWwZvYaNLPChGFsM6R2ey444vgxFL/Omo3H0sc57J+arrJISGk47eYK8DClfabjq+TaTfbdsKI2ZoEtAH27NWTcTTc876NaB3WSLpYO/crvGd3I7f33F0SfhJdXLCyHrlMeCU5MopnSLsOslaeGI7M2826eRxKHY61SO6zj667ZkQ4LReq+q6nxRx29RgFPoMV+lxAgbKq7nqwUWupIT6Nb+O79rqgfXRTWxSZ1qvefjlBGKUDvyk8dGQVJW0BdtpBxlKNNaTLzravRG3fiekci5hbGk8TXyZM0hq4R1uruHbZ0xi0Xtwcnr6hcSr3VRa0+2IcgdNS7oOexKtwQBolO86IzkJfiLb7GtG1bj3VkcP91TKV58e1GCXmOEs5IErsU6j X-Forefront-PRVS: 08476BC6EF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB2062; 23:zrmIJvo8IkfW8x12X/63ODTzuA8WKIV4QTQ2mlp?= =?us-ascii?Q?Zd9R9UXzlSUAPUcvGhHpP42hBxesqEL5QP5ySul3/v3v+8zMCCr6FOf68jC/?= =?us-ascii?Q?7RpuhA9fGXPwVlgc14AUCdUWbxFzpOEkoA8RtBRfyzfJZJdgVzEAgZqvZkpi?= =?us-ascii?Q?5865ERpzGs5YqzyzZIHEXxxy8Hkw+dFZiTiLSf+MuFFeNxzZp2+YGvDqq9+Z?= =?us-ascii?Q?+DtCUykWiJ7lTV5iQ7VU/zYsg7OeCzJka4wwIbm7EA/bI8obOwTh1IjK7t7A?= =?us-ascii?Q?UOpL2eVzT9IGZPZZ3mlX2jv56/c4tDJPh0pGHHARIhgo+YunMF4QDavYxsTY?= =?us-ascii?Q?qPbTr1fjHDIg0L/cQJwn/rl/hK93AiMhJUj6E8lGhKZSeTUN/gGPUGeugRlg?= =?us-ascii?Q?GMWHbIM7xRfY4KYD/g4OYrBnholGxuU0pjDSi4bmhcrFlLQ7hvw6ysUZhkZ7?= =?us-ascii?Q?kpmQqkM++iKlJb5dGAa5KK9KOrLaothYWByHSWMsxAhTelAJg7sX2Sb/SRsX?= =?us-ascii?Q?5pC1Dzd/dkZn7TvS+U1gDWXXxT5KWgGRzFOqV3k/Nia4i8Ia/HPl3wmq3uoa?= =?us-ascii?Q?btxriUWBb5tUrOjEt9DB9aPMxd2otpmp5drxXVwgZFUjzRWTdIAAmI7WB7Q9?= =?us-ascii?Q?Z0u/sHzZOHAY2Mcw3/riPhBA34biqYbEqjIK/G4bSbuju+hhEEqfHzDWOj+X?= =?us-ascii?Q?5uWovgL+biTU1fXmGXAtSUs3mDcMKv7IPHOgbUK8q7fAICGmINnGde+FzvOr?= =?us-ascii?Q?i/HbzdNIFFQmmBTnYaRVHQwdxIcHquDY53Ucrd9h/0Ci70nhYsCRjKSOHUwX?= =?us-ascii?Q?0i0UCUsJOclVeXrB5XE2i1s7uka+sdP3Gkjz9CtNSAOu/AR/pcfeRqerHT9p?= =?us-ascii?Q?ZJX/R2/QOa2Sv8AfFIa5AHpsbB1JOZUXSWYegtObkny1qXKoJ8KXRCMUfaQB?= =?us-ascii?Q?OBb5qjx8fb/nvkbbJz60v6dKzhGINw1OxfSFxubS/q6ukB4RdC2FBdg12r9/?= =?us-ascii?Q?PybxtyCI3TiKhhxRkE/JeZt59lvfPGpC3gmRiejC/mbdet4D0MNqZBXdDeTq?= =?us-ascii?Q?Ye5if/U/Yk9lVY/wUp65B0fEio9JAyFAoKM3syqaiFpxV2jSJig=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2062; 5:9/eJa12d21PaB+o0oHOvCvoXTESbUa8W0dd2dz0FoqqbffD0SSkJPnqcMwe6EZd5gRsFOgQVBUoTsY0y3s/B2BSicSLWkq9ww5Gvq1wFkIJKNmqlCQyr+LEbYPA+ChFSZZiQeUOB8S7PUWHBWYrwHCgkpj4LFO+l6exK5FhQGlI=; 24:qNUklYaArBiS4oANvIp6SGhFpBJ6jG+WJdoU2RX9WuatPxG7eqx1Bj1Qvh42Wh9ei6uERnt/Q+Ar1c2MFo//diZbPIZL8xYABYGOPHxY1Hs= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2016 05:27:26.6249 (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: SN1PR0301MB2062 X-Mailman-Approved-At: Tue, 09 Feb 2016 07:20:13 +0100 Cc: Saksham Jain <saksham.jain@nxp.com>, ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH v4 12/14] SECURE_BOOT: Use default bootargs during Secure Boot 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/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index aa222bb..566fd80 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -44,11 +44,18 @@ * "41066b564c6ffcef40ccbc1e0a5d0d519604000c785d97bbefd25e4d288d1c8b" */ +#ifdef CONFIG_BOOTARGS +#define CONFIG_SET_BOOTARGS "setenv bootargs \'" CONFIG_BOOTARGS" \';" +#else +#define CONFIG_SET_BOOTARGS "setenv bootargs \'root=/dev/ram " \ + "rw console=ttyS0,115200 ramdisk_size=600000\';" +#endif + + #ifdef CONFIG_BOOTSCRIPT_KEY_HASH #define CONFIG_SECBOOT \ "setenv bs_hdraddr " __stringify(CONFIG_BOOTSCRIPT_HDR_ADDR)";" \ - "setenv bootargs \'root=/dev/ram rw console=ttyS0,115200 " \ - "ramdisk_size=600000\';" \ + CONFIG_SET_BOOTARGS \ CONFIG_EXTRA_ENV \ "esbc_validate $bs_hdraddr " \ __stringify(CONFIG_BOOTSCRIPT_KEY_HASH)";" \ @@ -57,8 +64,7 @@ #else #define CONFIG_SECBOOT \ "setenv bs_hdraddr " __stringify(CONFIG_BOOTSCRIPT_HDR_ADDR)";" \ - "setenv bootargs \'root=/dev/ram rw console=ttyS0,115200 " \ - "ramdisk_size=600000\';" \ + CONFIG_SET_BOOTARGS \ CONFIG_EXTRA_ENV \ "esbc_validate $bs_hdraddr;" \ "source $img_addr;" \