Message ID | 1453987216-26745-12-git-send-email-saksham.jain@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 43ED1140BB5 for <incoming@patchwork.ozlabs.org>; Fri, 29 Jan 2016 00:59:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4292362166; Thu, 28 Jan 2016 14:58:15 +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 XTmReNecBToU; Thu, 28 Jan 2016 14:58:15 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7542862167; Thu, 28 Jan 2016 14:57:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E5328A74BA for <u-boot@lists.denx.de>; Thu, 28 Jan 2016 14:24:11 +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 iIWPavEQ2B_0 for <u-boot@lists.denx.de>; Thu, 28 Jan 2016 14:24:11 +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-bl2-obe.outbound.protection.outlook.com (mail-bl2on0084.outbound.protection.outlook.com [65.55.169.84]) by theia.denx.de (Postfix) with ESMTPS id 1144C4B9A5 for <u-boot@lists.denx.de>; Thu, 28 Jan 2016 14:24:01 +0100 (CET) Received: from BY2PR03CA059.namprd03.prod.outlook.com (10.141.249.32) by BY2PR0301MB0696.namprd03.prod.outlook.com (10.160.63.150) with Microsoft SMTP Server (TLS) id 15.1.390.13; Thu, 28 Jan 2016 13:23:54 +0000 Received: from BL2FFO11OLC013.protection.gbl (2a01:111:f400:7c09::191) by BY2PR03CA059.outlook.office365.com (2a01:111:e400:2c5d::32) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Thu, 28 Jan 2016 13:23:53 +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 BL2FFO11OLC013.mail.protection.outlook.com (10.173.160.161) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Thu, 28 Jan 2016 13:23: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 u0SDMiqs022558; Thu, 28 Jan 2016 06:23:47 -0700 From: Saksham Jain <saksham.jain@nxp.com> To: <u-boot@lists.denx.de> Date: Thu, 28 Jan 2016 18:50:13 +0530 Message-ID: <1453987216-26745-12-git-send-email-saksham.jain@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1453987216-26745-1-git-send-email-saksham.jain@nxp.com> References: <1453987216-26745-1-git-send-email-saksham.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130984610333659634; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC013; 1:4lYUhwmaJ5z62pwyljZBaD0ZwPrippPLaRmYTVNtGm1j76fiAyeEM67GWLDjCLmHubufD0tIz+Fhcs3AITlErW9ea8dhzNWGBv3tZ5nP3eqDenIirUcafr3BfCpTrneyupWzucND7P3sadmCc1nvSTOo00HkLsMi+9hfynwIEaz5fmi7+fbMLCU1eyaQFYIHukfwzZljKlTtIpPitLWfsa1mYYcV1POLrRy7zv5OdYyCeec/TPTVtyMigE4V7MQX1JexPWzYqGw9LSxfhxcXTGBaheZulgYZGJpm1axTlQ4kQ7JVBJChfMPibWDlC4QqrmdZTTNBj956LSJnBeAxYf6eeq7xizRTehXVdnGmrZutOsgolQDiEvbc9AcOh8wONvNCtejHKGLS6kb22k1AK7JkVzTGyAT+I6C+5d+h/7HBPocYbWVhJHHNLak6QSWmkNASH4sPxO3BdUXcxjkunlcAbZGCZS3SncoKoRaUIAfpPn2dtfRCYCtuC1CRNySUN3bXqk+hqLrqd6SU7qOl6Dp7ID9ArRclr9Bt2jJOiDmTtuYlnBmnvwQUKt9rhY80xPN5yrfN0FN+Y5LydhvqUw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(85426001)(189998001)(104016004)(50466002)(106466001)(105606002)(76176999)(50986999)(6806005)(2351001)(50226001)(110136002)(1220700001)(1096002)(36756003)(3470700001)(5001960100002)(47776003)(586003)(86362001)(33646002)(575784001)(4326007)(5003940100001)(77096005)(229853001)(48376002)(2950100001)(97736004)(81156007)(19580405001)(92566002)(87936001)(5008740100001)(2906002)(19580395003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0696; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 8541f50b-0115-4841-11f2-08d327e64472 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 2:ytIPWLzAhyb7sxQNqSOV4hnmwA8ik/SR8dUPRWAss6fsMlfqbeTvcsRHNehK6I4uJW+ZTWeujRDfMHcRB3hKwxrW5DUUdBTGYhaIVPuxELqwX/DZqytzPQVH9wp4b7L+ElLZ/BWaJdyt06DurMnoKppa6qsrHzTXkjZNAAQOs20L1fqk0A40/XMYsf1Oa822; 3:Eaw18/HdFWZd1IsCQJqsU8ZJDvSIXyO0Qq5T0kAorYTlk/NudiV5hjTZ2idpze0qGZNr+B6gDrTsQT2loVpBMh3QlB/d4gjKdAUkxqM/FofERhWYjPhbw6N9xCI8mqSUu9xYeNuAPVmpWro+VyE2ACHKi6jRexYiEY7rPhQlPEM4IfEJ1udto6JW+w1Cr3gNqKxEhoUcqINOQkbDPxcuEsKi8mTneyasi25k3y4uYEw=; 25:gVTs7OaNKm9RjBJIdBdu4BKpV7F5MPXtCB9oPfPdHd5m4C1tvjRPVhkYivdDlQz2H9RgpdypBm1nbFI5+7p+BnlHsa+99zdAVIliJntXB2F932SpUuckKpH9fcqZeDUwwulyr22IuK6O9t8WWekWNrd+qhXGVxYAiZuYcHQlTylR1OvMgEUUHUYzsIW8IdmfWih3jx7kjKPxRmdVALToPNBK37UAYy37cE3tgLUwPpWoTLVwz3HL86KMuIo0gHiN X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0696; UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: <BY2PR0301MB069636680ECAB810C1874AEF9FDA0@BY2PR0301MB0696.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13015025)(13017025)(8121501046)(13023025)(13018025)(5005006)(3002001)(10201501046); SRVR:BY2PR0301MB0696; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0696; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 4:iR+iir201L94Yz3eeiTLH/MBYSinB/EmuuNjPqJEeTmrv/OApdx8eXDVUvtBhabEXLS6UjD0aKoI+elUjAfP6MQbBUapnKjpEMf7A27P6bWGaVtnUKfMo1nMrrPA3W3v2/HmXbWVFUmuhNDvNBR6Df4cbzE6FebY7IP/7+t0R8KS1f4+DbtBqaxmEWyBYn2d7euufGiMoPet6a7N/845eq8yOICcCCvw1W69O8BLify0iUcw6/qf9nqXH55fwzjBmDsETTcd15HnzArF6JpfZo4okroCIgZ0ss0fhNTXwz/MV0b2kMomuqSBFRA5eTNTc++50zIHamkRhvMRAh7WeYTOCVyUw8vobkJFKIo7grPRwkmwEffA7n04uMm/jFT2K56OMrulFRzdNxrYa6IyfrZUcVICRivka83LM9fSVH/vtJARQcYJEdMl9iSoeMY/LiIPi4umGuqhZtLVkoQE7X2Swb4tqhqgolO6OKu+4yjLIJjcdaduLW8PoOqcn5pk X-Forefront-PRVS: 083526BF8A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0696; 23:FxIdeKh2iVnNVS0EqobKnIXyKSxua+SreQkaLYE?= =?us-ascii?Q?elP+2CvBlNJ3YmvN+yJtiSYToG1QO2ZHIOTOZCW7euYQ7mzApJoCw76bRIMz?= =?us-ascii?Q?Jc6TiAwBGZajRUYZ8zZp3GHJORnNUnyixYH2JhHgyyK6TnS80FvelQ4tUEvl?= =?us-ascii?Q?AMYOO6tO4cmhGwHcwakEkdlH8WLL4Q5S6JU8pl35GHvFsHViod5bsQnc9DUJ?= =?us-ascii?Q?Is4DoWUUb/VPQYbRPLtbEiLslclD1xCrkh2LbyCN7Ub8ErMkv7cRvO7PzcR7?= =?us-ascii?Q?dfahtnfy2+9e+PzLyqu6hkbEFbO+Pl33mGC7B1LOm8m1PydYJ57b31QjU8Xd?= =?us-ascii?Q?M0foQ3Wkee1F51DHw1OH0WeKKNw0TElWUK47oUFg3R4Aszcale2fDMEwJxCy?= =?us-ascii?Q?xFpYCgnp5fWKNGn0J/MEP6NXy/IL8hDICx9AkIbbNGJI/WdW9KtWzdPf73aW?= =?us-ascii?Q?DXU7zYyiqHbaBsXyJkNAtlyKFh68VdLtMBXEZum+SPYO+IE99WK6d42wIWzz?= =?us-ascii?Q?5xOOVD+c/UzBHwzDjHRrMtS7CmLGcThEwYDf4p9CjHze0SN3fe1aT4UuC6Ce?= =?us-ascii?Q?8BqKsjJianCR2CVgawQArZYvznV6A9y4Em9/JxvZW/EDBQgiZoNWytuDu2u0?= =?us-ascii?Q?qllHF0yJwcn0SpRstv433d9qOgNrMxIixpjd7PSYBINuUpxNEoimSZldF8Ca?= =?us-ascii?Q?CP1/8AK5N/LnF7UsnWiADwQLakbByxo4hANrcKzVBJFyCfqzJhw37JLZqR9V?= =?us-ascii?Q?KqAA2hzrmnbLCHoLgwLmBz9Q/xh03ZSBpa4ojj5DKT5f8cHuz+PWQC/R/xFa?= =?us-ascii?Q?S78shAqnvN2LzUfMzClo3VYqblO8OBVASTu/JCrVWtZyQSexKLLXwJzOxxCo?= =?us-ascii?Q?wwgd74UykRUANcjHzU4/+OwmJrJWyUSEH+vymtQCKp2D0NuWQD9z3XAsaGEV?= =?us-ascii?Q?//HIvTxRUCrYbELfS4OaSUQDPvZAfdVnuyBCSj2WyL+mh9VDo5cYTc/dMRDq?= =?us-ascii?Q?b5si4myj8ZHPRMUH318/FCGE6s2NIJY+baO4/zSyk3wEL+IXyRF+GxSVx/VL?= =?us-ascii?Q?MLVbfLoeeul/xYCaAq+UDGrRRKSlaMcD7CJKxm+wuCMjewWyvl1H0ThVb4XF?= =?us-ascii?Q?5uhMH9H71AGjCMPY2Dz0RVPP18I9FCTGh?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 5:NL8fi4L19skzV6996WFzXOeH/okhvvDmuv+h9B+YYr5g+735XG7NmaykxDwlz+bdkaB/BFgHVReETWeS3onZmfs0CeKRPRRRCyTtFi/2I6JJ62KIM2mmNla8XvD+eXYQxKOgZvjaHV5fr6TyCYEB1VA2MCVYGX6ZzHL6TbCf/cc=; 24:ykFMXzGSqmFnvv9NIR8KEeqOJYIq3fxgP+1Bg4NsJ3LwPOshcwr4v8RnkeOd0sz5N4d7Dt7S3HITipoEBJ2EGNOnxwR6kLAnb31mfp7D7AU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2016 13:23:51.0883 (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: BY2PR0301MB0696 X-Mailman-Approved-At: Thu, 28 Jan 2016 14:56:36 +0100 Cc: Saksham Jain <saksham.jain@nxp.com>, ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH v2 12/15] 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;" \