Message ID | 20190827064033.28973-20-peng.fan@nxp.com |
---|---|
State | Accepted |
Commit | d2041725e84b6796d12a0ea587e6ed84dee8a59f |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="XuVIwJDz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46HfM64wJ3z9s7T for <incoming@patchwork.ozlabs.org>; Tue, 27 Aug 2019 16:37:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 373AEC21F8A; Tue, 27 Aug 2019 06:35:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8E30AC22009; Tue, 27 Aug 2019 06:29:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 05D75C2221F; Tue, 27 Aug 2019 06:25:44 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60071.outbound.protection.outlook.com [40.107.6.71]) by lists.denx.de (Postfix) with ESMTPS id 58038C21E96 for <u-boot@lists.denx.de>; Tue, 27 Aug 2019 06:25:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tip5TqMBf8ZjJHVyXyyitJuHbxPFBfGtQTyRxcYqN+djbHIqx78y0eALR5530vNTp3kROKeWYG84J/15mfVW/xqh7yi+3+uJ9GNlGNKYmtc9o/Eu9ZUAw4CX7a6grOpYJbVjP9R/JdACQ2jpLaAAAt6sGnm0J76uOXu+S7cM5vOKg48Uuv0ww/QAPQba4cKb24ZqVkI5GX9dFHm6q2rSH34WKXnGOJuMQFNCKbwByLDG+UQ1PKS0MKqaEwJtQ96IOsi8bU0p4EP/ANGs/7Bq7flYZ99XQi/e1oPMCHYNw7ZtlbqXL2Lb4BaUscfPHNoZs4Q1pgSLSt+Zte1L7iG8JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qi/+bIZhvaq8EolO1+TO9TZEYofpdS4YReH/qHgyaYg=; b=hiqWd2kVz/pg3rVrUbp6Ly/BBpOVigLBghPRxSvHvHQY6vor/zpmGbYQsoG8bva2SA+fHgf+sU46OrwAqrdlxT3cjPcxj2DhE3DVLWxa4t/o1hclM1Jd9eD19Q3COGmFncdyjuR17tUjky3AoXLamBVKtQ1RwyLG1q2S290Cssn2LrBpYnxgn2ET64ca92jdLaS0RpR+EVk5qld5UE10jEDq4Zk3LhjxD/pVp1y5BMCifBZQ5fixrW3OAu0g8D3Ca29gPuCxNT9uvY75rdlpEouHXRcjxwMO96Oh7AcVbJwV2ElQxrJPCFWx9N7C2nz3i6X7oGdnAV4ZmC25UL64GQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qi/+bIZhvaq8EolO1+TO9TZEYofpdS4YReH/qHgyaYg=; b=XuVIwJDzGdOZBfhBr9GnL7Qrlw7N/4EM2qtknug44Gri4b2MLdl98weNEaeRLinQ1zr0DwrNtvX4gwoK6JliQsa7KJhHjJLi6CASuLi/nU6tUGhWryktErOyXS84GdqDNfZKSepuz5T6rm5U/eb3znchQ0AdySGj/UbSkGgZABk= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5521.eurprd04.prod.outlook.com (20.178.112.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.21; Tue, 27 Aug 2019 06:25:41 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2178.022; Tue, 27 Aug 2019 06:25:41 +0000 From: Peng Fan <peng.fan@nxp.com> To: "sbabic@denx.de" <sbabic@denx.de>, "festevam@gmail.com" <festevam@gmail.com>, "lukma@denx.de" <lukma@denx.de> Thread-Topic: [PATCH V3 19/27] imx8m: restrict reset_cpu Thread-Index: AQHVXKA/GeTH1pFqK0aY0kAMQGE2Vg== Date: Tue, 27 Aug 2019 06:25:41 +0000 Message-ID: <20190827064033.28973-20-peng.fan@nxp.com> References: <20190827064033.28973-1-peng.fan@nxp.com> In-Reply-To: <20190827064033.28973-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK2PR03CA0066.apcprd03.prod.outlook.com (2603:1096:202:17::36) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d3d03e3f-6ff0-4a26-d964-08d72ab761f7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB5521; x-ms-traffictypediagnostic: AM0PR04MB5521: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: <AM0PR04MB552197C0ED9941215A7AB06788A00@AM0PR04MB5521.eurprd04.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:4303; x-forefront-prvs: 0142F22657 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(376002)(39860400002)(136003)(346002)(396003)(199004)(189003)(53936002)(478600001)(66066001)(71190400001)(71200400001)(86362001)(81156014)(81166006)(6512007)(6436002)(6506007)(8676002)(5660300002)(66946007)(66446008)(6116002)(66556008)(50226002)(6486002)(8936002)(64756008)(3846002)(36756003)(186003)(2501003)(52116002)(2906002)(76176011)(386003)(486006)(66476007)(2201001)(2616005)(26005)(25786009)(476003)(110136005)(102836004)(446003)(14454004)(11346002)(99286004)(4326008)(54906003)(305945005)(256004)(7736002)(1076003)(44832011)(316002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5521; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ioydUARgkTynaGyUfDdU4bvyR0OkW4R82EMwCp5Hb7IBczR4XKt18aVFGEbZqWzeulWf8GfS+OoqwjdotCzUc3jOkRyKjqGSciuinPFjCQJ8bVadtyvW5lbKq02j0hjX01x/5j5WIf5yd90pbLIWqmT6SGKEi9+IQCxMARebbNnKA3WVI+UVDZ8Vj0E1hVsRdGg3rYslxLSDhHVxRSQXgDZh1tzeZ7MfLs1f9hvNL5ml6lCPBHnNJBsxS5IG/X3Co6/v4ngU/xN/2//C61lhTPhVUx2mzSsjaT9eNDpaNy2Kl6HrUSN5D92BDBYHadUwlZWtE+Yh5idAgNYShcwgZNr9ZdGC5xPt/a0mqBe6EaqKzC97m1M9k/oJSaSOEqQmprOas2mZBbovHMNeM9ABUzwNoCSRic7iqr2jolg6Cds= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3d03e3f-6ff0-4a26-d964-08d72ab761f7 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2019 06:25:41.2666 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: kebyZgjZvdQ4+LO8RLWobphOVQJZKrRuUe1MBnsSyPDbFjcxMkjwP3GgKwgrcJyQcb8d5IcYu6EHBPhc64ylTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5521 Cc: "u-boot@lists.denx.de" <u-boot@lists.denx.de>, dl-uboot-imx <uboot-imx@nxp.com> Subject: [U-Boot] [PATCH V3 19/27] imx8m: restrict reset_cpu X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/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: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
i.MX8MM support
|
expand
|
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index ac80266010..3a54db4898 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -301,16 +301,21 @@ int ft_system_setup(void *blob, bd_t *bd) } #endif +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYSRESET) void reset_cpu(ulong addr) { - struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; + struct watchdog_regs *wdog = (struct watchdog_regs *)addr; - /* Clear WDA to trigger WDOG_B immediately */ - writew((WCR_WDE | WCR_SRS), &wdog->wcr); + if (!addr) + wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; - while (1) { - /* - * spin for .5 seconds before reset - */ - } + /* Clear WDA to trigger WDOG_B immediately */ + writew((WCR_WDE | WCR_SRS), &wdog->wcr); + + while (1) { + /* + * spin for .5 seconds before reset + */ + } } +#endif
Make reset_cpu only visible when CONFIG_SYSRESET not defined or CONFIG_SPL_BUILD. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- arch/arm/mach-imx/imx8m/soc.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)