Message ID | 1453888871-13307-13-git-send-email-saksham.jain@nxp.com |
---|---|
State | Accepted |
Commit | 2bfe4890856c94d939e193999dccdc75afc5c5bd |
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 CE9751401AD for <incoming@patchwork.ozlabs.org>; Wed, 27 Jan 2016 21:36:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4C7B662115; Wed, 27 Jan 2016 11:36:18 +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 D0WWdT2tfG9p; Wed, 27 Jan 2016 11:36:18 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E552A62126; Wed, 27 Jan 2016 11:35:15 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EB889A7574 for <u-boot@lists.denx.de>; Wed, 27 Jan 2016 11:19:59 +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 tOAzDXLz7fUk for <u-boot@lists.denx.de>; Wed, 27 Jan 2016 11:19:59 +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-bn1on0081.outbound.protection.outlook.com [157.56.110.81]) by theia.denx.de (Postfix) with ESMTPS id 3C09EA751C for <u-boot@lists.denx.de>; Wed, 27 Jan 2016 11:19:55 +0100 (CET) Received: from BY2PR03CA042.namprd03.prod.outlook.com (10.141.249.15) by DM2PR0301MB1261.namprd03.prod.outlook.com (10.160.219.26) with Microsoft SMTP Server (TLS) id 15.1.361.13; Wed, 27 Jan 2016 10:04:52 +0000 Received: from BY2FFO11FD006.protection.gbl (2a01:111:f400:7c0c::119) by BY2PR03CA042.outlook.office365.com (2a01:111:e400:2c5d::15) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Wed, 27 Jan 2016 10:04:51 +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 BY2FFO11FD006.mail.protection.outlook.com (10.1.14.127) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Wed, 27 Jan 2016 10:04:51 +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 u0RA3eGo009838; Wed, 27 Jan 2016 03:04:47 -0700 From: Saksham Jain <saksham.jain@nxp.com> To: <u-boot@lists.denx.de> Date: Wed, 27 Jan 2016 15:31:09 +0530 Message-ID: <1453888871-13307-13-git-send-email-saksham.jain@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1453888871-13307-1-git-send-email-saksham.jain@nxp.com> References: <1453888871-13307-1-git-send-email-saksham.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130983626914933194; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD006; 1:iSGhtbQp1XGGObkAVPpYR65Vy0C1siXEQOIJlGLrQM08y2UpPhGKffFSnjHiYqt3oC7LR5dBJ9GSrI6WzKWTrGICGGgWY2ivXc6zFzFHo6WU3yWo38pmXzZS9rbDBzHvWTPLZNzAR+SpUZNgTJdDMvo2codTsDxbBr6QIKckNls/MOUejUU2yUb5j+5801gg+9sHgNZRuUzXAoRdw304xN0t5P+Mz6fDPb47EeRLRbuspqZltJWMFiljnB3O6GcmrCtPNtr3vkAfuBRzVBNwhrlP3iGUi3dfmQtFugX1860A58+k/LdSL3l7XDFnMAuzwgWmht7OkORFO3+d0NdlAawVXn1pu3ROE6CeQ5nvbGTEIo99URXuh85nNhRphtXa0zJzWHL7gQ4iSMKJHhP5rEwOu+YqNHdwhR6EGmXaRpxM04lJ3qWUnOcdooVM58kGgKci7GUYXqt/OeMbEa5SrJyRA/smXgXeE67o9v8Rfz0h4Vp9+v+rav2qtdwpM9zT5JkZfbnEnKfse2axTNhtDQwZs1qB6TyZx95nNqZHbh6Gg7YEZ1ltH00Z2VUH3F9rjgBDGinmPIzGoj3BwYKxNA== 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)(19580405001)(4326007)(87936001)(2906002)(33646002)(86362001)(50226001)(36756003)(92566002)(575784001)(5003940100001)(50466002)(77096005)(1096002)(1220700001)(104016004)(2351001)(11100500001)(229853001)(85426001)(5001960100002)(2950100001)(106466001)(48376002)(586003)(50986999)(19580395003)(5008740100001)(76176999)(6806005)(47776003)(105606002)(97736004)(81156007)(189998001)(3470700001)(110136002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB1261; 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; DM2PR0301MB1261; 2:nZ1+0nN3dDrNTyuk3eB1J9yGrOvuTD50phMdZrEBcFG4cSq1fcqLRuWzvRPkT9Nr+z1l+h0he7M/htv3PIkZW64vH4rE1AHGg9yl9/GS3LOBq4vWET6LC3W90xkT0Jy+S+IzdjRsI0zVzKX2zw3SAw==; 3:wLHvVVmw4/DC8G4TE31WFksTEtUk7gnNpOd0D1ZGi5QJF5boaloUp5LCz+N7gFAohvn6HodJ1BiRWUeRYEfeEmwroYfJninpaFz2H/beAh+ntJWZ+jIVRyjKWa1yOz3fF3ZGxXN9cNIFlKz8s8x2zwxyEwFFFrXguIWYjJszgtl97XPi1X3Ivpz14f2OEDLZsGrYd0rji9SS6pcm9iaeQ955Y4NMgRdJ4xfFBCCrKJk=; 25:3vZBGVHPpXJsRMEa8g7GvY10wxGoY7JI6MbwS7TJXbIMv4uqtsiEAHuBqMFquBE7P9zrKj/AAdXy95jeqmcoVxhosCVoaNpx1gKSZ5R8YzE4N/HDH5xZMKiLCrsWmIjAyPyHqndQliKp59ri5iEN07ol/esbDPwIMROhOTwOWl0bZ6JbStdQGFm1ZqeHx1tbF/k+thVz/N7gRc4Ne/xemaa4OuatjHAWC2+M01Yb8mYPYedFVJyNUkytcjOKvN6G X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1261; X-MS-Office365-Filtering-Correlation-Id: ce5d9f57-7697-43ce-29ca-08d327014c1f X-Microsoft-Antispam-PRVS: <DM2PR0301MB1261CD2F20BD28258C5550009FD90@DM2PR0301MB1261.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13023025)(5005006)(13024025)(13017025)(8121501046)(13015025)(10201501046)(3002001); SRVR:DM2PR0301MB1261; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB1261; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1261; 4:qEMdZpFi8lQKgv+85SOcuHHEMD2Nx6uiG2wCuoBS3nwE1QA8Oc2CAlyG0ztcnadA3YwkHyXbJePduFXPuXekZ/Q/jHGE+FGy5d6u4nsU+vVOpQlnp0MLaO2PDe+w+q9t7Ozj3LHkrBXbhCEiHsoOaablCyHCqeYFagJhTIweRH4OKBxZYtejna54KX8sk8iHdWYsuGGND6a4VOsMib+0rBqJ/DpBuKCpPaoQB298YHdRjNfAGzZxyhgqLaKAzndON/WZZOt19sLewNY3ABjZrHhlynTxAlOrwrAo6w3kFjavdtdWPa+HxgvSQJQNtjAfShUudL4svrHdEq+s/KFxdpxGHrWnEtFIMsaFlfIUEdwSQsQfQyswN+jrr4XzR9+JtiRt0xKb7uej9AmH99r9rzjSLd6nHRuCDOXGMILSwHdHVyRTS4NrcJKJ+E90Uzhq7yuAP3b4L8zFzBN7aJLdg8cG9nF0tixPELiCi2KhnGOsgYTAfaxheprLpmZ9Y4jq X-Forefront-PRVS: 0834BAF534 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1261; 23:Qv7vv3ACRZy7Y/bB4nLqNoLC6bNjsApckD7hsCB?= =?us-ascii?Q?YVStfdoHVY1X+tiv6w/ILbOWIlnGZZTycPBDBsbL3LGWMANhWKVI00yR3t9y?= =?us-ascii?Q?CdgdfPjqmCGq5GKYN6WY9WodAWLRioZCBANkI7d+kzenlPmGXg6O31PH5uw6?= =?us-ascii?Q?h2zmwhWbpqTsJKOVqOqsHKBd9cD0fgyFi9++K7rq8Tn1fGS0eIztBfRYJ62E?= =?us-ascii?Q?J2FFuDc1nY1Y+2LrUGIbgNiqEVj8rd9FkI3rl7E8F4nCdDE0J9I1oIlrDIih?= =?us-ascii?Q?c9lbPEhMFhbvby6XSHgVv1F0Kv+3vwUIV1jA/+RLIbKa3SO/nM0GBTVbJe3v?= =?us-ascii?Q?UkZ1b83IsNS+yeFP5eWSp6bRL2JM8+GyHhjRiv9vrJdjCsOjSglCLqwmUk7u?= =?us-ascii?Q?WbsEANvG5Fa6ewoa7+1vir+eAPQgX0hyo4A5ej0ehMyOm1LBlD6csD+KVm3n?= =?us-ascii?Q?ynrCuvQI1+0OPySfGumlnoHCkCi+n9jQVrykXUcK/a/UEK7px1wwr628iyS8?= =?us-ascii?Q?Z4ffwZv+L5Z4lSlASWnPjchg4MbqHY8Lrcu8Sm0YOKJubNNeSxR/pO7YYaND?= =?us-ascii?Q?LC7gNtaeBHmxrT+ZUb5tdg7eGF+wqxVhz4TEOQkoQ94Ei6Xn+1hJYIo3anas?= =?us-ascii?Q?Muvfy7OfZvXMM7D3IZsgWVJyX7aUyIw5P39RhKp1jFx6SRqfGgJavGxaL3/T?= =?us-ascii?Q?JlMB5RP92UodN0/cc3TIc0Wlic+KoM7yKpdz5upbaaONUcXhp93C6i+ZJE84?= =?us-ascii?Q?/Fs1mg0x57ikQbe677r/X4hJjSuYxhoWYIz3zNIRue3ueb3O1d5QKk25rP44?= =?us-ascii?Q?SQwWCPLxosyPvlZ7Tnvc0ioTPcf7XekGVNdJxdxBwBstFbs7Qlxh46hHdKFL?= =?us-ascii?Q?x3nXPD+q8hg6Su5HGVd9fr95UKhgS0l6sOpqCx0R0kDiUup+Kdj6W6gGSeP2?= =?us-ascii?Q?tCtSqpnYxeEf3s9TXu0+m4fd8X0Pzaq4qilJq8PjkoN558r6OltVD7esAARu?= =?us-ascii?Q?hZpHUa9P3I9RLBhGwXzfB0Y1M+QdBoc4VWRNLYsvyl2wEsMpXM7J7F5LgeUr?= =?us-ascii?Q?gK1DJcgYVnAYtLZ9G4sQIBBQT/py61V5BVxpLKqiHzeSoD6KZPk7PumVx/pN?= =?us-ascii?Q?XaXH6zgTtYTeiHa8IN/9mxEEOHAhQ65DFcs3epy+/8JuWKNQoGVPmFw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1261; 5:cpiJrIe64T29sQyhF0M7u+GEqbe37lLCNYr4eoa2owXzqyYbV4ZVQZkqYcDUOzQHJuuSduWIXQudsFvSLQFDaNYyuELobYtjrtfs3miW6JOwxGeGf1pLmwIazijrENLfmPkIGJdEKLTETC7hcH5blIxq/xSzfR0Xa/azYh+IrPY=; 24:H+EeV9f7pIs+6qY3/DpXySzc6OMibuHAuBN2IdhPb0NupuB2I37ctKriEh3WXzmTGMI4H7OvyNZrv4BsOINEMNGc+Ncto0Kz8F2ORZS2hL4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2016 10:04:51.1969 (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: DM2PR0301MB1261 X-Mailman-Approved-At: Wed, 27 Jan 2016 11:34:34 +0100 Cc: Saksham Jain <saksham.jain@nxp.com>, ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH 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;" \