From patchwork Fri Sep 20 03:27:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1164978 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) 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="Cscln8mk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46ZK1l5Vntz9s4Y for ; Fri, 20 Sep 2019 13:28:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 558B2C21DA1; Fri, 20 Sep 2019 03:27:51 +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 C1288C21E0F; Fri, 20 Sep 2019 03:27:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 360EDC21D8A; Fri, 20 Sep 2019 03:27:43 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70041.outbound.protection.outlook.com [40.107.7.41]) by lists.denx.de (Postfix) with ESMTPS id 479A3C21D74 for ; Fri, 20 Sep 2019 03:27:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qc8WgvTCrh5cynhIsunvfdUlr1bsPzGiuyYvBS10FyD4lcsu1O1/LAhHV7N7kqIO+0+QEq2E1UYBc2nsf14Wjoc2KB9Vg4T7uqtiZ5TEDDx1OWsmUOF3yafHfgGIusaahBXTCO+/k74sW4LMIiCa46Te2AK8J2yc1vXGg3ayxbq3cfbenRxjczwoFF3HG5Y1Vnz8TidcMaxEs9QdT2ZoPXeuLFWPqzGWHctGHVBh1i1tQ31vKyFrOH2VV0SuRezhi3qB8aprmE9aHmqgCWhYBZpUQ4nWw2+5AGzJE2iVtgtxHF0DPLCTmVLeThTt9ebVgl0IyNoBf0FdfCOX6l1uNA== 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=e+NIGrENsplpHtbsmPTjsZXNbBEesC4Ts/u43V4WqbE=; b=ZuUu+wI73QfuRvm2Kd7j9J7QDlnCv6EkWWN8JRFmEBivXBJc7Gp0BLwVnhUKkeTsm0pB8u00WGX86uXqbU6R8U0T8+BJUWl5K1xfpPPa5+jZeLM90a/nAP/NNYcOrTTdlGo5S1qB98pPsv25oKMnzcbm3aRpskXHkfoISa/H9rr9sTX/A8N97K2cydA4MRR13/xmaj7OB3aUzhnRlBATkR+iRqFvmdrZPZmVcw1hAFEOyKHJas/bUaqRCPLukGmYQzUbE+Jtbpu130wfwBrKltUgAmBT32BG58PayeRTXpVOU29kY+VgKQkuXZTsqFi0Vdh07DCMo4xFZaN0aGMJVw== 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=e+NIGrENsplpHtbsmPTjsZXNbBEesC4Ts/u43V4WqbE=; b=Cscln8mkCWoBtD5WdaqAKWhH77Ohw3FuFc5oC+7JuQo0M+39lYU0T3qgkL0FhgutyEvDTplGFvcZkyKp+fcOzNWv4vb/MJTBDaRuQ/q0LSHTKiKyMsTZ5k41ycu7pYcW1Wrl+0Rvep9yu64rX7j8jeFhesK+lEtecgsnEatKPAE= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6164.eurprd04.prod.outlook.com (20.179.33.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.23; Fri, 20 Sep 2019 03:27:38 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::6ca2:ec08:2b37:8ab8]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::6ca2:ec08:2b37:8ab8%6]) with mapi id 15.20.2263.023; Fri, 20 Sep 2019 03:27:38 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH 3/6] spl: nor: introduce spl_nor_get_uboot_base Thread-Index: AQHVb2NasPCX6KUZxkOvnLOtC0LuHA== Date: Fri, 20 Sep 2019 03:27:38 +0000 Message-ID: <20190920034412.31767-3-peng.fan@nxp.com> References: <20190920034412.31767-1-peng.fan@nxp.com> In-Reply-To: <20190920034412.31767-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: HK2PR03CA0051.apcprd03.prod.outlook.com (2603:1096:202:17::21) 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: 8fcb9361-0dab-4797-54f0-08d73d7a7c8f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600167)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB6164; x-ms-traffictypediagnostic: AM0PR04MB6164:|AM0PR04MB6164: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:207; x-forefront-prvs: 0166B75B74 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(396003)(136003)(376002)(39860400002)(366004)(199004)(189003)(446003)(11346002)(2616005)(2906002)(476003)(66556008)(66446008)(8676002)(81156014)(81166006)(64756008)(26005)(3846002)(36756003)(6116002)(71200400001)(6506007)(386003)(102836004)(66476007)(71190400001)(66946007)(486006)(305945005)(6512007)(1076003)(5660300002)(6486002)(7416002)(186003)(256004)(6436002)(7736002)(4326008)(54906003)(14454004)(25786009)(99286004)(50226002)(110136005)(316002)(2501003)(52116002)(8936002)(86362001)(44832011)(76176011)(66066001)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6164; 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: iI8YbbrFpShEYwOL3eZaQFoBKzT8pb8E9jgJ6YIYl4xqYyDZtKHzTSox99Rcje0YJy/4ev4n3ygXs5BmBmPXBKHMWOeXPftckBi7TOBgAGKdZnFbXcklcD5b7vCyraIiC0LoxejQP5QUgivgSVVmKIepik61k3lf3GDGGEyt+3NmPFmfqtmEvytP0aMIQkkXMxm3vkxm6NkSGfelWVHSmBKptFGKzTqH/6I+j4szdZdzYd3yFcqShqaan17BjarrPmdQxaF+cSNqjYEnKvG/YsCAcXO/DpApYExye17o+9wvOzhlJfcACocS/Gk9fNGKmeDXXyj3Aip3gA6O39a/twgVoaB6p6M+85iOKHEvO4mtAD9feiM7AJA3eDZSyDlSY33b4nNBcviU3KtXobEQRzco20+ioflrGDbm9y/zklk= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fcb9361-0dab-4797-54f0-08d73d7a7c8f X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Sep 2019 03:27:38.2936 (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: T28q2QiHq//Na4KBGFONaa880Mudr83/UyPD5cxCRPcdrdA+HG5H0hNDjzxmrZSVdUBXZRqQ7wsH+HLVtxYnAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6164 Cc: Marek Vasut , Tien Fong Chee , "u-boot@lists.denx.de" , dl-uboot-imx , Miquel Raynal , Stefan Roese , Michal Simek Subject: [U-Boot] [PATCH 3/6] spl: nor: introduce spl_nor_get_uboot_base X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Introduce weak spl_nor_get_uboot_base, then platform have their own implementation. Signed-off-by: Peng Fan Cc: Simon Goldschmidt Cc: Tien Fong Chee Cc: Marek Vasut Cc: Andreas Dannenberg Cc: Alex Kiernan Cc: Stefan Roese Cc: Patrick Delaunay Cc: Miquel Raynal Cc: Michal Simek --- common/spl/spl_nor.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 969e319de0..cb5d12d53d 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -18,6 +18,11 @@ static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector, } #endif +unsigned long __weak spl_nor_get_uboot_base(void) +{ + return CONFIG_SYS_UBOOT_BASE; +} + static int spl_nor_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { @@ -80,25 +85,25 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, * defined location in SDRAM */ #ifdef CONFIG_SPL_LOAD_FIT - header = (const struct image_header *)CONFIG_SYS_UBOOT_BASE; + header = (const struct image_header *)spl_nor_get_uboot_base(); if (image_get_magic(header) == FDT_MAGIC) { debug("Found FIT format U-Boot\n"); load.bl_len = 1; load.read = spl_nor_load_read; ret = spl_load_simple_fit(spl_image, &load, - CONFIG_SYS_UBOOT_BASE, + spl_nor_get_uboot_base(), (void *)header); return ret; } #endif ret = spl_parse_image_header(spl_image, - (const struct image_header *)CONFIG_SYS_UBOOT_BASE); + (const struct image_header *)spl_nor_get_uboot_base()); if (ret) return ret; memcpy((void *)(unsigned long)spl_image->load_addr, - (void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)), + (void *)(spl_nor_get_uboot_base() + sizeof(struct image_header)), spl_image->size); return 0;