From patchwork Tue Aug 2 11:03:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 654656 X-Patchwork-Delegate: yorksun@freescale.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 3s3YWz2M1dz9t3N for ; Tue, 2 Aug 2016 21:15:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 53EB2A7594; Tue, 2 Aug 2016 13:15:07 +0200 (CEST) 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 ux6raoMK8WC1; Tue, 2 Aug 2016 13:15:07 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 203E6A7541; Tue, 2 Aug 2016 13:15:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E7355A74F1 for ; Tue, 2 Aug 2016 13:14:56 +0200 (CEST) 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 RgnqvfP1tO4b for ; Tue, 2 Aug 2016 13:14:56 +0200 (CEST) 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 NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0079.outbound.protection.outlook.com [104.47.36.79]) by theia.denx.de (Postfix) with ESMTPS id 64C5DA74DB for ; Tue, 2 Aug 2016 13:14:50 +0200 (CEST) Received: from BY2PR03CA060.namprd03.prod.outlook.com (10.141.249.33) by SN1PR0301MB2062.namprd03.prod.outlook.com (10.163.227.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Tue, 2 Aug 2016 11:14:47 +0000 Received: from BL2FFO11FD013.protection.gbl (2a01:111:f400:7c09::152) by BY2PR03CA060.outlook.office365.com (2a01:111:e400:2c5d::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15 via Frontend Transport; Tue, 2 Aug 2016 11:14:47 +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=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.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 BL2FFO11FD013.mail.protection.outlook.com (10.173.160.221) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.549.5 via Frontend Transport; Tue, 2 Aug 2016 11:14:47 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u72BEcji024982; Tue, 2 Aug 2016 04:14:44 -0700 From: Zhiqiang Hou To: , , , , , , Date: Tue, 2 Aug 2016 19:03:23 +0800 Message-ID: <1470135807-48880-2-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1470135807-48880-1-git-send-email-Zhiqiang.Hou@nxp.com> References: <1470135807-48880-1-git-send-email-Zhiqiang.Hou@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131146100881673827; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(81156014)(8676002)(8666005)(50466002)(8936002)(48376002)(50226002)(305945005)(7846002)(229853001)(50986999)(81166006)(76176999)(85426001)(2906002)(47776003)(86362001)(106466001)(356003)(575784001)(2201001)(87936001)(5003940100001)(7416002)(11100500001)(104016004)(92566002)(19580395003)(19580405001)(2950100001)(77096005)(97736004)(105606002)(586003)(68736007)(189998001)(36756003)(4326007)(5001770100001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB2062; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD013; 1:djYdA6bGafVUbaxGRIeOgBaIL3T8WcYcIpGgqxRtIk4pMghMEU2xaVSW3fwdTSHrxJvrZEBvhg8pEbGpxNfP12aUqyTUtklj4XmqIH9B5NmkuDuTQTgAHB1qD+f8BRRtN48M4f4NBl3cabQ+so8cWWLzy9IbWgKGYHYe4J2iEEoKhdYOvZTzganLQxO/aymYgGRP5HH/ilSLiyPtuPDkHS0ForJp7aB93N9ocloK8dbVYzeIvB0Q00f+ByZtuo8ILR+yJBAc4Tju1VEhiUzz+7KdLpbGhDfxT/+180LVhN8Q1ggSkEAjAbI/uXmdxzkEIbc8GZmelzLxKO+/v3VFWkDtTs7jzhqp16l3WRgRmd6PNRAyQRfb+ZJVbePC22cHbv2Xd6bRFxqkov9JjIuaNpApG1mdrdJdiUAL/bdJ8D41zOmwUICnOKysLRLmwvx8Aq0EQxkWV5RCEsGLQ9pvKELbjO84qp/uVkn0ytzai8pHKyI1EndvdJxMMwlsxdEnFYCvZ/AuMnQa4ox1MWvs/aRFB70/i8GYDfl3hYXYKUOtMyKjjGWu/hxiKMCBdzQepw13x3DyCyw2YBinFcCC5vKcBADimRrGolLDKXQ44thU3ynBX3gkadxrj5eZsjWltK1ow3sV1FsoIYeOJjAFdZIB6FiOKJlFSpBw9QzeCeB8hTFH1/f/J+ftmySdpC4AQ2JqNYjxvL4Mt1IqjpBHdLz1lPsBGuU5oY/zWtS13aM= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ed8136db-15fb-4e5a-ce63-08d3bac63731 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2062; 2:Ql5BGQwnVR0OQRRnR/BarT0lj8ru+USDxU8p7wbp2AEUS2n4hEGCmv/sLyjjY0k96eMxjGzZjCFGcyExKipXzZSHf+hTgXk8MjDLUUfv1k7HFjQL6sMBTQImuhwp4V6cZ/YllBLbg2KVR+yqzzX5U72/SdLFo/PYpEWiOUiGjdtSl8GWUiPnxtsFrwNiFnfE; 3:+tPKKdaBrdr5sjTRICdLVWyaK2wbncCxENnS76k0+8xRhDQd2LwRQf4noxUeDVwEgC7aErVveTBLKYVW/C4N33aXLhh02Hz0jLmII+4p0dhYQST8mOGH8hKlUeawpFiw9eQ8qO7w3XxftEn5IGnIB+t/v2pRQLCx4xxtL0H+t4M7uQW2NnQqHzP3cQ/1Uo+moZFM9oZwAHf0SZGxdaQ7y3M+RbTvUzwcnPb0IkhoXF0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2062; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2062; 25:HRTWkrp6DLl1kf4oxUG8KZNuvjEVrVZ5d3xqX9HSiwpqyARXR0tdubL7GrdUaJkACVhRwHcUtaqf4E+lwmh5xvHPfrQKeAdzZFF7Nt2qMBV7xgqIWEmCtGT64NX6IorjMHfCnVwVjArxscwe09U2ENQdCcibAZuoCSkwTfz4gV3CXkqvPY5kyVeHEIaBZlk8YAE0LC1IPOeCi9NOhge/hRE72JA16N3bGnrM6ZuLWQ2Xc1YykjU3qA0JVIyh+oB7T2BFRDxi6wDZn0wv3eUX6/6rnPZU9ZLdlp5tXFLpoOUfy2crTySy1fFFUGbJTU2eU0JALrdETIhQx8hWDpfq/VwqMzm9u3HDPr36CjMHgXIgy8gmb0I1gelhAHYJeN2z8ZQonHV1cwF7nEZF1g6S5yk+lSoW2lgrn3hhuWxOx2Zgrf0ZpWPRgLESwJA6n72u/Tf8eNjpS3IBqTVTfP7rIDdQivc6xuE+Z80E5u1TYBdiTZP22MDKXndSkkOc4ayjgegXmJ94F463so9z9lkwHJxJE4y4UutSBVjAu30ZZpSiQqmpODMCAOdJEqa9Hmml6zJh6MrueZ+Tq9j7kLjFk55rDdnhnwcWi1lD6Y6m+A5IgVdtNVQ7OZQ0bUm1UIXVo7tCZauYMjrjZXXDvHXNbeupkuleW5i37MNRY14I+x/+l3y7XNokZFaVYa9SDNPpQwpjG6pXvJbOD3ddqn+UH04Zo1G+xWe84ZT1obo5jDSz/L3QYgIrxazB3KR11NB43n4frt7vSVbIhtxaEPqfqSoaNHLFFPvGz+WOPLULzz6CrasTEB2jFp4l5vasPtJm X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2062; 31:IZw8teCVmyvnrnjg44TPA1kVygXHAKhcnfRaBM4MQsxzbIZ6Q1MBwj+f5mfjbruAFcAT/++0OzMGSwjGxh5J42nQBiIdJ0jUDhXErlX98lrfRd1uVX6YJL9Bmi2l8YSziKLTGsbsRPZi0mgGEIyi1xmgexvHMnD/MJwBzz1WvlKCp5pPVZ6ByO4gn/1CUwLATK6ce5IAxp44fT1aMZ6v652b+9z4F65wLOT7sRrsOs0=; 4:Vx81bwg7yxMnWzTYZuZ84QCBYPnsI5Za4xuOTaPZ+HRp12Ua4Q22FHXoNtNjlRbIwZgJnDF5Y9JsBOmI/KsxBTL8Oet+3hQNER0+ohHeskaEbkzCp92gf0Rwvmvj+jKFbTPA3bMLW7vbGpt9KRJnlPwbYl2modNZcunUEy2OFWPTKXkiq9EYgHl8Ejy75CVU752kE84aS09oJsrwBhPZzlnVGwnkUe8+dos39lGEnobsqu8pArvfVyQJHU/R+Zn6Ju8rkKRMj404339kgB6wa3oVj0WWtPY+BE9DEnlfA1SljCAhZNjtmZOiDCnG6vVNgJBCldedL5BRAdFlGwX+VcYN1lPTvwYCIMy2wCJUTSeejNvkeByk8vw7+1s/mqg3s/1W/5U74+zfBgnzp/PuDt0pqpeaIiapGF3PbakddwVrTIl41us4ir1RdT1Gldfy0ZusAVgnHzIz6rTgPhgd3K9WLT0P8Yo4vyFyTKjVY1dSZQMQMMhOrjZsqJog2n32op0pVDCnuLkR96n+yOkH8g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(13017025)(13023025)(13018025)(13015025)(13024025)(3002001)(10201501046)(6055026); SRVR:SN1PR0301MB2062; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB2062; X-Forefront-PRVS: 0022134A87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB2062; 23:5MhvJsagnWS08S/QdjD5D+RNhB1xVzZ84yeVU9h?= =?us-ascii?Q?VKcm2PNmk/MibXRIz+VNVqHpLkdombblUXjUDrjJp7Zi7ExtrrvASHQr8DYH?= =?us-ascii?Q?xhykgEe7eWYs0oMKp4LqaaYp23YmumyNGTy4HtYYNXSqhNJm581MqyFHPGlo?= =?us-ascii?Q?HAnrD+4ZKagwVOJdvTit8y77BTx9y9F3y0zPAgiuwKEKVFVtVcUc/qYu1ZIu?= =?us-ascii?Q?7VOdg0DJm1ALvUtjMzZc1RQ0U3Y0HiXq12nvN8xRxlPgs4DaqS4PyMw1T46Q?= =?us-ascii?Q?s5kmAR0gWVM0aJ+Z33h84+8UaYvBqiuPztE0KXv7DC8BRjfISLvRdWTXDH9v?= =?us-ascii?Q?rcbIV9QWKJxLRdqZVMWBEGtWesJPCNigjWM8gONCNi5dbKm5+1yI6ff7d1E0?= =?us-ascii?Q?V0ek91H+H+290e87FcNfVImxdudBWQJsAAQvgIMVKag5fWjFdQLz6tBxSqCp?= =?us-ascii?Q?YoxGVeEtfpqTF9CNg0g6KJgUYDxHB20pu0GpARiVxfQTuUb1f065+FzpQQ4C?= =?us-ascii?Q?e2/TTw7CH3X1cXRcffTilEzKVN1kW/v6tSIx+NO33e2UxXj6wQSUM5Q/mE2Z?= =?us-ascii?Q?sW+d4tn3bZyW9iykI70tkztOhl9Ptuiqq01NIZ5gtTKZThgEZK/cwgA8LQOp?= =?us-ascii?Q?qhjyECLil/DHkRzq+WbyAEiQcU1n7rbKIwrwTVVqeO5mRtfxB45sQD2hDUYM?= =?us-ascii?Q?1SY/4UANW92FAjrHgwPWE/mQ/Rw3/utUhv/qXcITd2p/NfF9g3INLlud2TEb?= =?us-ascii?Q?bsIFyGtArVqKGF0jTLTyr+JI4bDAsOT08jCqHOHy4T2uXbxG2lIPDhC1uD76?= =?us-ascii?Q?Q6BOUYw4KmZP+BRqtFsCBOF1OsaAkzD6/q1U586lZGVXP2hgRG1P9b8ITuPX?= =?us-ascii?Q?fU1Tsa8jR0EbeYCxD1WDcBeFfn11ztQ564a4Vf6qfJ2G2elxFLnwnFYnU3pC?= =?us-ascii?Q?mW98OD6vliSU22nueq5fK2LUkr+wtA3AWeWpzRHSy8JW1gYXGR7GmG4nbub1?= =?us-ascii?Q?zS0mCR+S/BwimgRpzWwDbh0/wN4t9zIlCehLsWxVkzTC+bAvoUjsQzvf9SJz?= =?us-ascii?Q?Yz5aRZWyT14F32YUcRAzq/YmFQO60/MzihqW66OPYb9HE2tV0i6TjoXRtbZo?= =?us-ascii?Q?hXG7Ge0SGzzHOi5QeeNQRqddgsWJAdD0tUVdOI99HuhaL7tHrSGZNHg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2062; 6:OFhiF+rYbJnQR2ow1FGPPfM51fgLlJv6CVGKFQWSX21LaibPdp+C1hEcKnP/qGxaycC2EQwTYK4OWvQaZLKZClgAv/biM/YWQPaTfYXaLmKpQrohGYUtyEB3jAQZhRDPGPN9uZgdmp8kU4Uke6oYfXw2oXbqIv0ignLKdzf/NHiPiX6dtcVj39QG4hy6M1oD6CloUr3NEGoaWsgQIaw4+Gw9qEVAgca3S8ZDAegkdauAj5iiC3+99zdZLUR+belHhrCwbVIt5VyXnpguwySojsdQH5epvohbriUScOZbDsc=; 5:vMmynUcEXK/RdXUoonSjvUtL/PS5DV+1XkTvbsRoIJT/nn0xZ+HCjqbjEmda0qTNZkn8XuiSzsbFRLeBbBSpOEXvChMH9aqozljmZwGz19YxwQHkRCjxogycNNMsaoPeDv0ZZiFTkEKGOss6LJ5cDmNu1KdLjYNDxhNuzWwI3rA=; 24:UDJqSYZhjXKApVUFCDhtfQZ1xMXde939Z7cB5TyGHJYJabf2Oxp26HXHj90NVlQFybBLr4zA/9NVRGCfwlHtvyh40ruKDXM7y37NJ7DM6Sc=; 7:SECzM/jovYMq9FBvTnweYhATD2vb3kuiXIzSIYwzyM/ZNhfKHAJx/1LSoQOs8cC3RMyK+MDeiCiHeYg1ZN9ibUhikzqUcvwd/hEHFDJMIwoZqBrsX8AVfKZs1Ivc6vsfgTh/OpqbPXykQDXNgAnbxhFPtLAvoAFR3rKDiqqNjdr0xpjzDFnoa1UMQz27SYA9bB/7DOZz4jUf8RjItWQalNTYgyrOAkHNGhoO3WJjuRSf4do4rrc2XeIluDXiScyz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2016 11:14:47.9801 (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 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCHv2 2/5] arm: fsl-layerscape: move forward the non-secure access permission setup 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" From: Hou Zhiqiang Move forward the basic non-secure access enable operation, so the subsequent individual device access permission can override it. And collect the dispersed callers in board level, and then move them to SoC level. Signed-off-by: Hou Zhiqiang --- V2 - no change arch/arm/cpu/armv7/ls102xa/soc.c | 5 +++++ arch/arm/cpu/armv8/fsl-layerscape/soc.c | 5 +++++ arch/arm/cpu/armv8/fsl-layerscape/spl.c | 4 ---- board/freescale/ls1012afrdm/ls1012afrdm.c | 5 ----- board/freescale/ls1012aqds/ls1012aqds.c | 5 ----- board/freescale/ls1012ardb/ls1012ardb.c | 5 ----- board/freescale/ls1021aqds/ls1021aqds.c | 4 ---- board/freescale/ls1021atwr/ls1021atwr.c | 4 ---- board/freescale/ls1043aqds/ls1043aqds.c | 4 ---- board/freescale/ls1043ardb/ls1043ardb.c | 5 ----- 10 files changed, 10 insertions(+), 36 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c index b1b0c71..4c93ab7 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -10,6 +10,7 @@ #include #include #include +#include struct liodn_id_table sec_liodn_tbl[] = { SET_SEC_JR_LIODN_ENTRY(0, 0x10, 0x10), @@ -64,6 +65,10 @@ int arch_soc_init(void) struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; unsigned int major; +#ifdef CONFIG_LAYERSCAPE_NS_ACCESS + enable_layerscape_ns_access(); +#endif + #ifdef CONFIG_FSL_QSPI out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL); #endif diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index f62b78d..fac539d 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -12,6 +12,7 @@ #include #include #include +#include #ifdef CONFIG_SYS_FSL_DDR #include #include @@ -303,6 +304,10 @@ void fsl_lsch2_early_init_f(void) struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; +#ifdef CONFIG_LAYERSCAPE_NS_ACCESS + enable_layerscape_ns_access(); +#endif + #ifdef CONFIG_FSL_IFC init_early_memctl_regs(); /* tighten IFC timing */ #endif diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 19e34fa..b75547d 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -8,7 +8,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -66,9 +65,6 @@ void board_init_f(ulong dummy) /* Clear the BSS */ memset(__bss_start, 0, __bss_end - __bss_start); -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif board_init_r(NULL, 0); } #endif diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index a94a458..5a2b1f4 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -175,10 +174,6 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #endif -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif - return 0; } diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 71eea82..852d683 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -207,10 +206,6 @@ int board_init(void) out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER); -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif - #ifdef CONFIG_ENV_IS_NOWHERE gd->env_addr = (ulong)&default_environment[0]; #endif diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index f69768d..a3748de 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -207,10 +206,6 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #endif -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif - return 0; } diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index dbea0bf..291b0f4 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -446,10 +446,6 @@ int board_init(void) ls102xa_smmu_stream_id_init(); -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif - #ifdef CONFIG_U_QE u_qe_init(); #endif diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 77482a9..85c036b 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -489,10 +489,6 @@ int board_init(void) ls102xa_smmu_stream_id_init(); -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif - #ifdef CONFIG_U_QE u_qe_init(); #endif diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 941dfbc..1642557 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -316,9 +315,6 @@ int board_init(void) config_serdes_mux(); #endif -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif return 0; } diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index d3e37b4..0a73e0f 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -90,10 +89,6 @@ int board_init(void) init_final_memctl_regs(); #endif -#ifdef CONFIG_LAYERSCAPE_NS_ACCESS - enable_layerscape_ns_access(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif