From patchwork Wed Dec 28 16:43:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 709374 X-Patchwork-Delegate: trini@ti.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 3tpf2S4RJVz9sD6 for ; Thu, 29 Dec 2016 03:53:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 81F23B38C8; Wed, 28 Dec 2016 17:53:45 +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 tEPbhnKjSN2t; Wed, 28 Dec 2016 17:53:45 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C6183B392F; Wed, 28 Dec 2016 17:53:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A8C09B3889 for ; Wed, 28 Dec 2016 17:44:21 +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 fgp5HRWSL1kA for ; Wed, 28 Dec 2016 17:44:21 +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 NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0051.outbound.protection.outlook.com [104.47.33.51]) by theia.denx.de (Postfix) with ESMTPS id 2635BB38C6 for ; Wed, 28 Dec 2016 17:44:18 +0100 (CET) Received: from BN6PR03CA0013.namprd03.prod.outlook.com (10.168.230.151) by DM2PR0301MB0750.namprd03.prod.outlook.com (10.160.97.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Wed, 28 Dec 2016 16:44:15 +0000 Received: from BL2FFO11OLC006.protection.gbl (2a01:111:f400:7c09::105) by BN6PR03CA0013.outlook.office365.com (2603:10b6:404:23::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10 via Frontend Transport; Wed, 28 Dec 2016 16:44:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11OLC006.mail.protection.outlook.com (10.173.160.95) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Wed, 28 Dec 2016 16:44:13 +0000 Received: from oslab-l16.am.freescale.net ([10.213.172.100]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBSGhvtO026038; Wed, 28 Dec 2016 09:44:11 -0700 From: York Sun To: U-Boot Mailing List Date: Wed, 28 Dec 2016 08:43:31 -0800 Message-ID: <1482943430-10231-6-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482943430-10231-1-git-send-email-york.sun@nxp.com> References: <1482943430-10231-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131274170545038857; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(336005)(7916002)(39380400002)(39850400002)(39400400002)(39840400002)(39410400002)(39450400003)(39860400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(69596002)(50986999)(86362001)(97736004)(189998001)(107886002)(92566002)(575784001)(105606002)(5003940100001)(106466001)(104016004)(50466002)(76176999)(33646002)(36756003)(4001430100002)(81156014)(81166006)(8676002)(50226002)(8936002)(39060400001)(38730400001)(48376002)(4326007)(626004)(68736007)(2906002)(77096006)(47776003)(110136003)(356003)(6666003)(2950100002)(6916009)(8656002)(7416002)(305945005)(5660300001)(85426001)(7059030)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0750; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC006; 1:QJN1hQucyBzIUH7wIB5JkHHZy7/ZnJl8SPPWDlUX0SH3Xv9+TtnSFA+haq7KNkxnyo1uVFL9mdOd+DA2VbiGKgMCY8uKQbmvNqYhOwG2XGqqE0TvUwxZb6RpLtzaMGaB2e1ZPNoDCHZPVO8Zc9flpam1yOsigR2AtP0dRnh+ZQDynU2M3L19gcwQgCErA1hQWo43UIcJAk5B8/la9TswRwmxVX6kZJLTwrROt+SfLLqqD48S9WjnJxC2wuiDYSVXzmO7a0OVklpMTxi1jJ7mVJLC2ah9nwhu9/PljTmLFOD6rDY5dOvRoT5WEmjAv6/XqhK6CvOsqdrC4h84vqxRA2cisQHHK6ybAKYWChI1vNqUMZCV5WzaASs42JbvWN6Xtrxtn3hSMtB8qAx3W21ZrtAFGog0zBmeUGpyp5WxUxE/VNQBFUm6wcM5BzCn8W3oSoTV8CMG2tp0HLXoxsx+vPhdOBSBoH+O3Zdm7M5jZrpAIc7M0e4Lde1A1uWJM4A6HFe9sHdYUWaand+645ubGRg9Y2LCcdwzbvGYC4Xt2fMC+L+DXz6TyPj0+2YxSLsKaZpuEY4gn9AbNykL9ZrhiPQKgtynwWYNz3O4n6TDElth592kmevur+GtNGIsm8nS8i1XXaGjKnoLL+nMEqvEmVLzt0UlyEX+rJEDD5IcFX0hLoDVDFNbtFzHIcbJmOp7ErUZjL5BaaRV3DBh8fGksx93Le+YANKmCIX/ZoLQpqKEjgBoyzMH9cdUad/kHv7/WuG/mbiU2GEw3Hzt6UojWQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: cbc5b9b6-dc5c-4a7c-04ac-08d42f40c1fa X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0750; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 3:7Tm7hRz8Da/+kroT/1kjOzUvQtEWsLE4k+BBz0BJzOUvgY5LzntPDd3kY5732aXkcUVTGusi1DRHvoApoN9VsZFe4fuSJp8IWFo2gsyNA3X8UR/ksL4Zdp/ZvuYUZrAD9YjSuPlsbQTRu3XA1cJBViGUCjSj9DFZn0dk2Neqovtf+NdAm0XtWrQN8kqz5eRfaiOLxduCBdffOqZCtFL168WAt2y3ar/5HYAOAKXPpfWqjFQfoI3SkfKgskUE9pIUiGUSbqRqV0ALNXHVgovY7k/rkTN5j7SRHQsEjNxHzOgE9EJG/qxcJI7/fVkQa/R6X85w0BTthg06m7mxI+Jrxi5RmD5l+pumInVRzE+X6MRmILAqt/LV8uK91+yH4aWm X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 25:8vzjXva6yFP0efTjsUtKoVOTij5q7coFduob6GkN8S4O5yfnwlaHVf3YPZkMB4MLSmuv8T/VKYkIMnCCXy1u/0qagnF5EuysRjI0/IVdOmrNF6CPttJGofHXzBGLvsLgYopjYoMUjemPPgrlL7MVs2bw8g+I2sPVtYgnUZP8TRQqEKfshpOL4eL1Kcwpm4RgVjCyGGNDZ1sKrq//vVNTb5rHy+EwAOnvKiORiTYWLbHP3CHF/OCTBzqh1LBB+c2i+jJQ9LiVL85oHCEpZTaN5Vq8h83wQ+7VAEdLgERZGyB6piVzkDmV+JOnwfhwUd69J/lGrlGDxhMrXR76j7AZDiGL6w+dNYD21ulRlpWqqb/EOgLl/MyFNH6UDYhuy5fWj78VjG3KKgTfJ701sODazNuFcxg2Bd/rm1xuLPDePwdKDn0UEXZeu3c6+G8jYNDsFA3XoyWUxYM9x7F8GWjYwvNxlrduWQABHpd/sEqwtI43dAM6S3vzMOV06Aa677RsIUyr6MAIJY3B1vYMj2bqzdLqnw/bJqLVCPK05/Qp0HrNnqruYyW/F2F7OYHQUx3U27ah24xptkCscu9Xf+ykIhcCamvexyAjFD0kfuOEW6c+RuXXUAIpYfZHGVZzKOBNjpxTLejtZl356cLXhV6UlwZVyCuFUO4zpvy+/SysA9WfNn4CZ/eyeaJlNqzxnwGd9ws04p7/rZPaj5myq6T8K59K9HCxCwirO58BHarqNS8lLCzqWHrqh0a7J9H/V/1YxPG6oZ4FBveTNTukNlENFfK85H7gEwxSWnSanMotTtCBohF4BzEdkzgJWsonjrXT X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 31:YW8AG4/GDjLFKlqfaK9yV9D18ajoOZolY2WbStjjwhWQOJN9vpBhXuDY+vYKeRf9shfCvIEnK+H1zSj08IiNbiowoc02hlxdRZyHl8nul3e9yz7sIX773qcn9ufPSCjHmnBts1HSheCEnnCytgzhh7Xl/VfAuxTvCgru5dQyBJtl3u404wsKgE9imPXA4PEl3VCdRMgNbqtU3yz0bnvZXSUnatjOJN7d0ht0uMif3tLYbcJKTM/fQOygIxtaLp6W4t2u6PsDAtCBxojWvKklWQwHRQPI897PedKV8BSZbH8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705)(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13017025)(13015025)(13018025)(13023025)(13024025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123559025)(20161123556025)(20161123561025); SRVR:DM2PR0301MB0750; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0750; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 4:nLMtAGebuWNAoSiENqIQ8tZBJtyYw9H5GRVCXyKAt6xDJO6BBP7jQvDmpvVYgw+w1pJE8DyZYx4OjnV87aGQOn+5plnFvQX66/9L/NApeAffTFUhKHazJa5Of8rg0SwNJbC4yVxTmorkMOKa0c0l23wHCxEuk8HFF3638aROeox5OhfM0EYB85W/SQD7UkeT0yfWFjaE+vpAKuCaqA8RUkVuKlETN+Klr9DV8EdvnC1XTJ29bs6aN5hlF2PIumyW1RVhJsEbCvILG3r79fwQbRm9qSP2pNps4YDhYlhRyuicWBTUWrcJ0wH79Sb3nFhgfyFdIvbT0tH7ZOHyXc/xq3RXikadB9xHpbveIJkM8F/ERKHZtjad0A6F1sjeIyo+JGvFT37KJpLN5buuXZNWRBhduZRyf7g050InkmqYEuzY9dkn18tIvJrK5XgB5dcr9/sv9g4YbODW/8NJ6/E1ofI708tvZx5cq9GXaycEyHDYFqkuLuRxLW8rk4hlW8dpT29/d6c39gLX5IZWjFy4R4h2kx25Wl5Y9jz6fv42Eo89o2EAboAjPLKqSU/OyfvgQNgIas4Rne3V11cXS6LyTNW2iiFvcfzkMQGVE+MXG5zn+2EqG7qMzlM0kySV1Db8X4GtefTJarQJ/Py6dSs9lZQ/dgQvX1hwGFhQHEXTI5mVEJG5s/ndABFcKX8RFw0L9IwrqwwpbwyfJTlvywPXZ8rZ2IpWSniTh3w669mGsKOcSdwjdTBGPHY0bT2JsNzj6p4aAz+hUe2iqEZnOByzNQ== X-Forefront-PRVS: 0170DAF08C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0750; 23:3Q2PGxkTKKMymgolFc4ihQvYzSFj2m81wFNenj+?= =?us-ascii?Q?Y/Gy5Zvz9qQDuiLKMqianJrLBIsOx/W/4vot8okKPShSlmG/gpIEDad/531V?= =?us-ascii?Q?axfpVX1fJa5i/5LJFmG98qoKoZ4Z82FjeciegpJwr0LZdFGaKTcE2WNtEzXt?= =?us-ascii?Q?0xx0wJzVYy6nAJjruv2eD5w2xd1v5s67XhzqnxGqw1uoSKEqSflE2aUtsD2m?= =?us-ascii?Q?9tuBERaDH4tKQ4vCXy/9DAiKlRcafm4hloogFoOlZjUc6YivEKulV70kPvur?= =?us-ascii?Q?ob1rKzpnmeKTeD4pzJzEw+9OyRitcDpZ9v+UcnFn5l1VAQ/mvWhGoqDUZl4e?= =?us-ascii?Q?Om4JUVrW+tHc2XITLV2rvXr+TmJaLjmHP8ClkYqzXlWrarzfUteSYk4nOdh6?= =?us-ascii?Q?YpDkQsnHKUUs3aQpCiToZrJ+kU1489Q+It4CWPItONpCbVw9szFiLh1bK19D?= =?us-ascii?Q?Hx3USMkE7akI52yEMbu3QZNAc6LCzI2ss29uGJJVO1ixPQvQfBDl8ecBdmd7?= =?us-ascii?Q?kYfvTI02ajJ7+zKouJMxL1cilJSjDdABW5mcU+XF41+lQ4x0FGsK0ukEI94B?= =?us-ascii?Q?T7LnK11JYzCOR7M9idcwcCsefrfcP6roV9jW2kfE1r/LPcHTEAKf01EicN1x?= =?us-ascii?Q?1H3JWyO+rYPcc5k08l+tJTr0XobvQq75pWYxe1sPpYw9F7j6u6pkSckRXCR5?= =?us-ascii?Q?nxFb53T1+BYqQwBlzY5Fsl1jKNAsOEqY/gna57L35DfKq4grt7FsQdBRa8ym?= =?us-ascii?Q?frxzuIPSjymr7X3sKH2+YxiFhb8fe3gpPUH2wGd0L/8UABIAGu4p12a4T8EU?= =?us-ascii?Q?phqGcAN4KxrribqP6nTAYZOYFrZVVFibjzaLOnk85aZoUuSbXykdt49CHOpr?= =?us-ascii?Q?t0UzX87HPNByebNB7LDY5lvGW3+aV8aKf1lQVGXffKPNbKhYs/FQlwlqjKRw?= =?us-ascii?Q?ikJyNYTb92iUD+sap00P+/IkKhqSUYL+bYm6JcrQ6zeVs6BRUnl4SSFZ34EZ?= =?us-ascii?Q?AbHSg8m14ZpB9BWdOHxLmDKiYqysFo0EpgzZXEMLzaQG0makavVQRg7Ry+X8?= =?us-ascii?Q?BaDudWNEqM3DYF+5saRpBag3MFL6zrZOeik72fwmhxMyJQ37s6AJGGca/MV8?= =?us-ascii?Q?49h/Y3XaQVRWQbVCnNOAnOEl/gMg9f1LXQop8qMgIzDSeMqN8PCFqeK5iOFh?= =?us-ascii?Q?FAX8v0pOQzP6sQZJjqORWsuBV8+Lw8ukQB4O8yrwXC6U4nK4nPpu9Fi3Hfkr?= =?us-ascii?Q?s8nBnNObkjuxU48f2VHrLXHvtLFI0AvwkHzNOf8zDzcubVfptT132v5ky4ui?= =?us-ascii?Q?mf0yg2KUqu6Ng7lLCwVN3N03HD7LlhYogeRCTJv9xOxmb4J8rMRuEC6ogbhQ?= =?us-ascii?Q?bwt2LrcnET6G4zc6HZinugN7JpxP0mRoKDW5Rnhpc5DMMlIk0HJexdNqrKfp?= =?us-ascii?Q?k9G4kZLzlbaeeJQ9eU7/nuqMfze+EnOSUAiduX9PtSMrUoqB1llI1KXXWZKo?= =?us-ascii?Q?MUgzkcQV41xc5/qn+rybMfq4+XVW2BC4IMJA=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 6:MNyh4ZmH+fLJDB3GGtMpZILRgDVXLPq+7M4ppXupNOH7oCSLYbVcVM7sIT4sruG43zW9WgQSClmh5OizpvGfuKBd6R2NEQaBdz8Z3sP22wBxFEVBjwBAgnnlouPURyOMNd7YvK7A/2QSSYzj4d/+CUrmCbFnvsNMpzbTU06lu5nguH8r6I7WqpD+oe9HR6Bioh8Spy8JxzfNFII0ZUpJUeE3uy4M0djHOPdfR+ATf8kF5i91ZCX0b8kJp8gh9kjHtLcAA9HZCexArnLhT+SsM4C9UiecNYanpYoT+77JyX7Ve5bJ0uyGKFPyRSaFonJSukouWwDDsq70rLiMb4wjcIjCZUSzz0MGVXAVRPV8O0Ji/vS3lfjsYV4uTmvd6dqFJQIJYbRjdanEL6Cuwit2hOlJSX++PZot4YIyz/6eWCqQbjLOoMCVzpBcPUjMycN3; 5:6j3fqaV2rHBelwHzniet0KCuHWA8jktFMgXCPv/JB9RriN8jH+lM9hYMBWKQbgtG/xG7O3haVhJrw/Ubiui0aNn5vn+fKGrLnveSPx7zf0cH2wjAXxKCQehf5DKQw5cHx7g4nqxXxvfToPImOE+Ct4UEiT3Je9+dhUJ9y3V7XYNiqjTSY8/xDPa/tt41wIKJ; 24:xL6+nZu5e8aVLggCC3s2kYV/zflYXTiE54lgmPHj34DbdUCUSA2SEyuCcr6Yc6AQEw7MTzvhQafCdEb4rOrKUa1cIWeOYwWZEn3+FXh/4ug= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0750; 7:bJkgwNVWSSnptmTQXMGt2Kzc6NfXtaSl0PNEVbqnffR7PiZrnjSafuDTRmxETxGW/DYqqfdYUoe0lBb13t1fGycdC/8Sedu5CvMvDn0x6XSinzrsPylsAcBNBLm0jbE7tEXKdKU5CUjMBmWvU5F4zlBdXpBWBkG4a0kDXKWAN5ncyvGZjQJheKamdkyHbqLtfKstvtfZwBCDeNwJ36ZI6mqEbDgtFNsSC9U3CD241j7AS3p7tnvLvupEFNLaB7H+QvzB1OICNUdV0Xxb6A8Z6wp2s+LcL2j9V+yCx0TMcFa6TSTP1M4ROM/ANucPfEj0XF5jkxWNLuhhsGJePQeOuDOrGveK+TJ8HKgtViIIa6FimyQ0sRZx7ofk50+Ep+cKWegHEIK7JyKiS9OzMZPV98545EHyuh23qSWjNs+3CiY33R2WFmLbYr2YFReHCD+TOa4UZ4bsERHUNRbibdSYkA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2016 16:44:13.9422 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0750 X-Mailman-Approved-At: Wed, 28 Dec 2016 17:53:27 +0100 Cc: Viresh Kumar , Gary Bisson , Jagan Teki , trini@konsulko.com, Stefan Agner , Hou Zhiqiang , Mingkai Hu , Albert Aribaud , Saksham Jain , Ulises Cardenas , Fabio Estevam Subject: [U-Boot] [PATCH 05/24] crypto: Move CONFIG_SYS_FSL_SEC_LE and _BE to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use Kconfig option to set little- or big-endian access to secure boot and trust architecture. Signed-off-by: York Sun --- arch/arm/Kconfig | 2 ++ arch/arm/cpu/armv7/ls102xa/Kconfig | 1 + arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 2 ++ arch/arm/include/asm/arch-fsl-layerscape/config.h | 4 --- arch/arm/include/asm/arch-ls102xa/config.h | 1 - arch/powerpc/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 35 +++++++++++++++++++++++ arch/powerpc/include/asm/config.h | 7 ----- arch/powerpc/include/asm/config_mpc85xx.h | 1 - drivers/crypto/fsl/Kconfig | 6 ++++ include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/fsl_sec.h | 2 +- scripts/config_whitelist.txt | 2 -- 14 files changed, 48 insertions(+), 18 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ff601ea..15a6233 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -466,12 +466,14 @@ config ARCH_MX7 select CPU_V7 select SYS_FSL_HAS_SEC if SECURE_BOOT select SYS_FSL_SEC_COMPAT_4 + select SYS_FSL_SEC_LE config ARCH_MX6 bool "Freescale MX6" select CPU_V7 select SYS_FSL_HAS_SEC if SECURE_BOOT select SYS_FSL_SEC_COMPAT_4 + select SYS_FSL_SEC_LE config ARCH_MX5 bool "Freescale MX5" diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index e233aa4..d154f7b 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -7,6 +7,7 @@ config ARCH_LS1021A select SYS_FSL_DDR_VER_50 select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_5 + select SYS_FSL_SEC_LE menu "LS102xA architecture" depends on ARCH_LS1021A diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 17b470d..a1f781e 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -31,12 +31,14 @@ config ARCH_LS2080A select SYS_FSL_HAS_DP_DDR select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_5 + select SYS_FSL_SEC_LE select SYS_FSL_SRDS_2 config FSL_LSCH2 bool select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_5 + select SYS_FSL_SEC_BE select SYS_FSL_SRDS_1 select SYS_HAS_SERDES diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index f4f9eaa..29fc33d 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -55,9 +55,6 @@ #define CONFIG_SYS_FSL_SFP_LE #define CONFIG_SYS_FSL_SRK_LE -/* SEC */ -#define CONFIG_SYS_FSL_SEC_LE - /* Security Monitor */ #define CONFIG_SYS_FSL_SEC_MON_LE @@ -144,7 +141,6 @@ #define CONFIG_SYS_FSL_QSPI_BE #define CONFIG_SYS_FSL_CCSR_GUR_BE #define CONFIG_SYS_FSL_PEX_LUT_BE -#define CONFIG_SYS_FSL_SEC_BE /* SoC related */ #ifdef CONFIG_LS1043A diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 97c69e9..1c5158b 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -106,7 +106,6 @@ #define CONFIG_SYS_FSL_QSPI_BE #define CONFIG_SYS_FSL_DCU_BE #define CONFIG_SYS_FSL_SEC_MON_LE -#define CONFIG_SYS_FSL_SEC_LE #define CONFIG_SYS_FSL_SFP_VER_3_2 #define CONFIG_SYS_FSL_SFP_BE #define CONFIG_SYS_FSL_SRK_LE diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 9fc1d5c..853e265 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -24,6 +24,7 @@ config MPC83xx bool "MPC83xx" select CREATE_ARCH_SYMLINK select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 config MPC85xx diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 1287ab6..f36114a 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -326,6 +326,7 @@ config ARCH_B4420 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_B4860 @@ -333,18 +334,21 @@ config ARCH_B4860 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_BSC9131 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_BSC9132 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 select SYS_PPC_E500_USE_DEBUG_TLB @@ -352,6 +356,7 @@ config ARCH_C29X bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_6 select SYS_PPC_E500_USE_DEBUG_TLB @@ -359,6 +364,7 @@ config ARCH_MPC8536 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -370,12 +376,14 @@ config ARCH_MPC8541 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 config ARCH_MPC8544 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -383,6 +391,7 @@ config ARCH_MPC8548 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -390,6 +399,7 @@ config ARCH_MPC8555 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 config ARCH_MPC8560 @@ -400,24 +410,28 @@ config ARCH_MPC8568 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 config ARCH_MPC8569 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 config ARCH_MPC8572 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 config ARCH_P1010 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 select SYS_PPC_E500_USE_DEBUG_TLB @@ -425,6 +439,7 @@ config ARCH_P1011 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -432,6 +447,7 @@ config ARCH_P1020 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -439,6 +455,7 @@ config ARCH_P1021 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -446,6 +463,7 @@ config ARCH_P1022 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -453,12 +471,14 @@ config ARCH_P1023 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_P1024 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -466,6 +486,7 @@ config ARCH_P1025 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -473,6 +494,7 @@ config ARCH_P2020 bool select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB @@ -481,6 +503,7 @@ config ARCH_P2041 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_P3041 @@ -488,6 +511,7 @@ config ARCH_P3041 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_P4080 @@ -495,6 +519,7 @@ config ARCH_P4080 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_P5020 @@ -502,6 +527,7 @@ config ARCH_P5020 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_P5040 @@ -509,6 +535,7 @@ config ARCH_P5040 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_QEMU_E500 @@ -519,6 +546,7 @@ config ARCH_T1023 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 config ARCH_T1024 @@ -526,6 +554,7 @@ config ARCH_T1024 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 config ARCH_T1040 @@ -533,6 +562,7 @@ config ARCH_T1040 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 config ARCH_T1042 @@ -540,6 +570,7 @@ config ARCH_T1042 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 config ARCH_T2080 @@ -547,6 +578,7 @@ config ARCH_T2080 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_T2081 @@ -554,6 +586,7 @@ config ARCH_T2081 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_T4160 @@ -561,6 +594,7 @@ config ARCH_T4160 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config ARCH_T4240 @@ -568,6 +602,7 @@ config ARCH_T4240 select E500MC select FSL_LAW select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 config BOOKE diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 9b7bcb0..d4f05d1 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -67,13 +67,6 @@ #endif #endif -/* - * SEC (crypto unit) major compatible version determination - */ -#if defined(CONFIG_MPC83xx) -#define CONFIG_SYS_FSL_SEC_BE -#endif - /* Since so many PPC SOCs have a semi-common LBC, define this here */ #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) || \ defined(CONFIG_MPC83xx) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 7131b61..8bae577 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -20,7 +20,6 @@ /* IP endianness */ #define CONFIG_SYS_FSL_IFC_BE -#define CONFIG_SYS_FSL_SEC_BE #define CONFIG_SYS_FSL_SFP_BE #define CONFIG_SYS_FSL_SEC_MON_BE diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 510a108..3188959 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -30,6 +30,9 @@ config SYS_FSL_SEC_COMPAT_6 help Secure boot and trust architecture compatible version 6 +config SYS_FSL_SEC_BE + bool "Big-endian access to Freescale Secure Boot" + config SYS_FSL_SEC_COMPAT int "Freescale Secure Boot compatibility" depends on SYS_FSL_HAS_SEC @@ -37,3 +40,6 @@ config SYS_FSL_SEC_COMPAT default 4 if SYS_FSL_SEC_COMPAT_4 default 5 if SYS_FSL_SEC_COMPAT_5 default 6 if SYS_FSL_SEC_COMPAT_6 + +config SYS_FSL_SEC_LE + bool "Little-endian access to Freescale Secure Boot" diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 8ee7aaf..74b0a97 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -96,7 +96,6 @@ #define CONFIG_CSF_SIZE 0x2000 #define CONFIG_FSL_CAAM #define CONFIG_CMD_DEKBLOB -#define CONFIG_SYS_FSL_SEC_LE #endif #endif diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index bd98925..f111fc5 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -77,7 +77,6 @@ #define CONFIG_CSF_SIZE 0x2000 #define CONFIG_FSL_CAAM #define CONFIG_CMD_DEKBLOB -#define CONFIG_SYS_FSL_SEC_LE #endif #endif diff --git a/include/fsl_sec.h b/include/fsl_sec.h index e6080d4..61c671d 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -24,7 +24,7 @@ #define sec_in16(a) in_be16(a) #define sec_clrbits32 clrbits_be32 #define sec_setbits32 setbits_be32 -#else +#elif defined(CONFIG_SYS_FSL_HAS_SEC) #error Neither CONFIG_SYS_FSL_SEC_LE nor CONFIG_SYS_FSL_SEC_BE is defined #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fa54921..fcae43a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5547,9 +5547,7 @@ CONFIG_SYS_FSL_SCFG_OFFSET CONFIG_SYS_FSL_SCFG_PIXCLKCR_OFFSET CONFIG_SYS_FSL_SCFG_PIXCLK_ADDR CONFIG_SYS_FSL_SEC_ADDR -CONFIG_SYS_FSL_SEC_BE CONFIG_SYS_FSL_SEC_IDX_OFFSET -CONFIG_SYS_FSL_SEC_LE CONFIG_SYS_FSL_SEC_MON_BE CONFIG_SYS_FSL_SEC_MON_LE CONFIG_SYS_FSL_SEC_OFFSET