Message ID | 20190827064033.28973-4-peng.fan@nxp.com |
---|---|
State | Accepted |
Commit | 28cb058ff748aa592014fcc8049b6bac1e2e4a2e |
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="szHJsWj2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46Hf5q4Yz7z9sN6 for <incoming@patchwork.ozlabs.org>; Tue, 27 Aug 2019 16:26:23 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F3819C21E39; Tue, 27 Aug 2019 06:25:36 +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 B55AFC2200C; Tue, 27 Aug 2019 06:25:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0AE28C21F3C; Tue, 27 Aug 2019 06:24:54 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150051.outbound.protection.outlook.com [40.107.15.51]) by lists.denx.de (Postfix) with ESMTPS id EBB9BC21FE2 for <u-boot@lists.denx.de>; Tue, 27 Aug 2019 06:24:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DiFWxUYJ9KkLAapY1hmxnLB8zTdSJPzlfJniZwYWrdLsJxhIhLj/x8zYNDQRRjQGRZSrd2wcZpRTbkO9EvQb7tukGDv1gANVqPIzl0DINtOXBM7xDUlwiQbDxkQUFPbU0ukHJEGIAreddQYsdxOO5cmLL/tvoGbaMsfjrgJPzmdhZsqm2AmT3qAacnLG/zC1hcKEihMAz8j2XK2xd3nxEUsRC8xU/oB9lpwvY+pM3X2tnsiRr2R9cu1wd2PwNjjZF/HIqzleWtlmhGaTA+fccpoQCp1xrc+z27/4fpyOQlRN4T53w1OpxUcbpVAtSbZbqGdOaLoAv7BOuMpWG7naKg== 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=6ZFIOGxgvy5qf6U6mvX7rNH0o4Er6b5D4KiqyxGrft8=; b=Ylis1nt+j/yaDtTSQPdIOLDEBW36x8p7TVhZ/Y3loN8cXDpq5mq0m1I4X5dsYXcPRFiUBsrfJl5EoaDOxKzgdRXi/PKuywXWASBRdM1uh2RSyy246lTTHqcFkbweK2skRVRDbTGgXm5fHLBYWZ1O37WZXtV5rZA6POQP4yFUC5dESmcnRV+dSobfsYagZqyc5/acEXZbXkn44B0Ok+nJwNql/BjB6qnKqENd5449I5qM3VaQld5LoWqaz1abRTyvHUi/fUmBzaxKrhBz5AjQKqEHgrlH1fcvsmbSOxh1c+o9cIr6Xd1Lqwr/0XJVLCS6JohYtsUHsim/SFfYOUKqzA== 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=6ZFIOGxgvy5qf6U6mvX7rNH0o4Er6b5D4KiqyxGrft8=; b=szHJsWj2dzwrb7TVehiFo7+4kNRL/r9BEtIidzOq5jA2d533GkjWrGFbGNqayjc0BepN7mlerCK4+WDISk82/o7XZgNLcjbK0VtfJmqFGQ+j8RCPJCZ5Hlhb7Ynv07xm6DZMH+4eUl3iYIaiKaQCi3WV2LZPQlEhEwq4aQBkEgI= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6675.eurprd04.prod.outlook.com (20.179.253.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.20; Tue, 27 Aug 2019 06:24:47 +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:24:47 +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 03/27] ddr: imx8m: fix ddr firmware location when enable SPL OF Thread-Index: AQHVXKAfSFzKIWODdUGyABQKOf1xhA== Date: Tue, 27 Aug 2019 06:24:47 +0000 Message-ID: <20190827064033.28973-4-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: 02cb9e38-2b36-4ddb-4581-08d72ab741f2 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:AM0PR04MB6675; x-ms-traffictypediagnostic: AM0PR04MB6675: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: <AM0PR04MB66751F38E72EC7F1791E1FDC88A00@AM0PR04MB6675.eurprd04.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:1332; x-forefront-prvs: 0142F22657 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(346002)(376002)(396003)(136003)(39860400002)(189003)(199004)(2201001)(2501003)(4326008)(50226002)(86362001)(26005)(14444005)(6506007)(71190400001)(1076003)(256004)(102836004)(2616005)(386003)(66476007)(64756008)(66556008)(5660300002)(446003)(66946007)(486006)(11346002)(186003)(6116002)(3846002)(110136005)(8936002)(81156014)(81166006)(53936002)(99286004)(8676002)(6436002)(52116002)(66446008)(476003)(76176011)(14454004)(44832011)(66066001)(36756003)(2906002)(478600001)(71200400001)(305945005)(6512007)(316002)(54906003)(25786009)(7736002)(6486002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6675; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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: H3ZewxG5A9UXddo3fHt+74gsa39EeiUHSnWQ3lE15s9lL7ucVFTC3bmz2Dij/f8vmqhQdl5bip1S0KGJZFDM2sNNejPqM8Et7fl2K8M2iObtj+4ml3v1UECh3V4gzAIeLe+DEKtS3j0/KJdrvsyHNAZioPUxBT2Y35TJvmITwvjAJPcnu8Wi9jAqmTinXj33MEdBvswO+NYplV2fH8WceqrVQB/rhOY/CuLRdIljZZOXZPV0QGmEHZ4jOGMQNMNKU6eFCLIMwDL99Uda06hqseKNYpsG5w80JDl/81tStampFoucMRcsaAkjwZJGsABDmyyhDeYjfU5U9MPKFvgBhPx7kGT2LXXKwkFRMB6wQGOpkw2L2y0bieFOGudSPe2jfd66OTODCVoN/yXrvkMKtdfiCby/OIDVu+xtnV1pZq0= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02cb9e38-2b36-4ddb-4581-08d72ab741f2 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2019 06:24:47.4460 (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: yzhj+6nAK4ToOARJsFpY+FtP79NqqEVcW5bG7xsDOT6C7X5ft/219VF6IqsHWBmPSKmauklEN4DWwa1Jgz4+ZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6675 Cc: "u-boot@lists.denx.de" <u-boot@lists.denx.de>, dl-uboot-imx <uboot-imx@nxp.com> Subject: [U-Boot] [PATCH V3 03/27] ddr: imx8m: fix ddr firmware location when enable SPL OF 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/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c index 61cd4f6db1..3e605353ea 100644 --- a/drivers/ddr/imx/imx8m/helper.c +++ b/drivers/ddr/imx/imx8m/helper.c @@ -31,7 +31,17 @@ void ddr_load_train_firmware(enum fw_type type) unsigned long pr_to32, pr_from32; unsigned long fw_offset = type ? IMEM_2D_OFFSET : 0; unsigned long imem_start = (unsigned long)&_end + fw_offset; - unsigned long dmem_start = imem_start + IMEM_LEN; + unsigned long dmem_start; + +#ifdef CONFIG_SPL_OF_CONTROL + if (gd->fdt_blob && !fdt_check_header(gd->fdt_blob)) { + imem_start = roundup((unsigned long)&_end + + fdt_totalsize(gd->fdt_blob), 4) + + fw_offset; + } +#endif + + dmem_start = imem_start + IMEM_LEN; pr_from32 = imem_start; pr_to32 = DDR_TRAIN_CODE_BASE_ADDR + 4 * IMEM_OFFSET_ADDR;