From patchwork Tue Nov 24 08:54:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 547896 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 F3A661402CC for ; Tue, 24 Nov 2015 19:55:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E35F64B98E; Tue, 24 Nov 2015 09:55: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 47R8GJHs6wxO; Tue, 24 Nov 2015 09:55:45 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8BE274B9E1; Tue, 24 Nov 2015 09:55:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 076A44A01C for ; Tue, 24 Nov 2015 09:55:14 +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 tRAuxHvM-K4s for ; Tue, 24 Nov 2015 09:55:13 +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 na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bn0102.outbound.protection.outlook.com [157.56.110.102]) by theia.denx.de (Postfix) with ESMTPS id 2D14C4BCAA for ; Tue, 24 Nov 2015 09:55:09 +0100 (CET) Received: from BY2PR03CA007.namprd03.prod.outlook.com (10.255.93.24) by BY2PR0301MB0677.namprd03.prod.outlook.com (10.160.63.144) with Microsoft SMTP Server (TLS) id 15.1.331.20; Tue, 24 Nov 2015 08:55:06 +0000 Received: from BN1AFFO11FD012.protection.gbl (10.255.93.4) by BY2PR03CA007.outlook.office365.com (10.255.93.24) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Tue, 24 Nov 2015 08:55:05 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; konsulko.com; dkim=none (message not signed) header.d=none; konsulko.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD012.mail.protection.outlook.com (10.58.52.72) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Tue, 24 Nov 2015 08:55:04 +0000 Received: from linux-7smt.suse (b51431-11.ap.freescale.net [10.193.102.134]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAO8sWnL023192; Tue, 24 Nov 2015 01:55:01 -0700 From: Peng Fan To: Date: Tue, 24 Nov 2015 16:54:22 +0800 Message-ID: <1448355263-545-3-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1448355263-545-1-git-send-email-Peng.Fan@freescale.com> References: <1448355263-545-1-git-send-email-Peng.Fan@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD012; 1:w6I9Nk6E04/21ttufuRDa+vzJe8SuXcJ+gNzqYZedTxJdFt7KljlkZLk+KdcGAsM2nuuvenr0htKptD+30pv++/PMC4+qLyzFLfpZmYkGCHj+OdDvWgVlFvcE4quIy9QGkvxCTWgJNZKN5sa7YBAeofekzP58nQmmQO3a813V+NWRS7plgLEdixiK4JW8yqR7UY4sB6F6gDVBWNxXQVFGK/PppqvAqS7J/3SzJ6T+nOlW+VuJLeTtbYrWU7YUcrRR9s7c4s2IDJI50vvWznBxgHYRTuEXk08aaPdl9J11p68syLSs5YJtxVgQJH6Aq6MSZ9bFtruFdSwIFpY3GOYTynYzjyL/QBl4aynBhhN+U+pgppyaRUx+6dr4SGneE6O+5q9b3VmFlf6VDvZb6r1NUXfsxGvrjAYr0i3k3nhuJQ= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(77096005)(69596002)(50226001)(2950100001)(110136002)(5001960100002)(189998001)(87936001)(85326001)(97736004)(5008740100001)(81156007)(36756003)(50466002)(2351001)(6806005)(47776003)(19580395003)(5003940100001)(104016004)(586003)(19580405001)(50986999)(106466001)(48376002)(86362001)(76176999)(5007970100001)(229853001)(92566002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB0677; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0677; 2:aFqBatIzoBHvqCFXH/HWP6Ddsv4mVr6YMjBhfu94y/X8u0ayZjEIqUcB6F2XfrNYP1Z30R5BlrqUIgcEJBwrgUJvjk/KVZhFfWjW4XSJZxwzRHaga5yQb9zHsgz473Omw/PjIHjEStATiXUaQvOrjA==; 3:AVBVte0mjCVMROUdMrTPueDLeNz+GsTdjVHBtdjOXgQIdPD/INzR3HA0y9kPV5YWfWWf3KmptNVI2vh6dWW7vaCc/+X2CBxcVqAaMmyJnNk/otUIZznAld1kJdwHLasDV4buqHy66HoxZfTYOUOyToj/9KECWWxiya2UWGvOgFsV0GciSk38GUG05+PDIQayMlByKlJPuUsVESvNNym0VCvp1bRFkqNUHPYTPtnIHkg=; 25:saGBphNiIOlZQuZk2CBXWPxIJFaQgv3R7cVTvoOqE4bA4mBUt9jBEDjhVM6R7YAhUVLv0tiy5LEMZ0+0VGv/8yd4GT7CNBA0xaVxOJiJeyqzfykhQ7lETTkwHhYPK3AmxzRjdWucDtgSiOmoqG6zgHJFC4X0TDgx7MGI/oA4cEwoYH90BryrOLScMvr60QkOvB3sdBmbHnvWd8uJg1Pb4e1VycBJTZe4b1Lz83Dd2LsWSs4z2tzAZaOr8DEAe6HJknUUj5kaDfljG6F4TOClHg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0677; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0677; 20:l/v77clJc6vYzd8Jetx8pD0jux3LpOoGO7S1rd3GuXHpgjyHar6tpT/eGTXVwasj8Zmsqz5T1npeDwSRbSz9vPA4YQaEQISzK/Zir0c3XUUn5mto2DlBDlJH9vvM9WBp4q+IYol0JGE1xrVwZpjKm1niQWV3bNcvX0k88rXtLh6h9EA3ncRxp/1zETfZxBM04tAVQ/if5EMpXQgyQOf94rVaG1x+Ur4QdjKg3xChjNba5RcUrYrXBwh9C5SNAFZZ/RttQUutOYiHC3RxASw4yAYxfQ85NzmEDhSDHrZvgGcbuQr+jX0NBXhZTlA1XyTejKOC/XTLy+mG+Ftxb80BxmHfz4wIRMWgAmsPxa45FKo=; 4:TqpIHTLvgN9OLq8ntT7M1ly/XsslN1Ho6ZLz/qne5hNjFsM+jmd/bfNXwabHJN+fRLmlC3wNA2yudL2YirDADOwGkuBU5e2J9Ii4SSWhU/Z/HAMsj3rcmAgfYJ5J3MACCwsU6JknY+yZDFJX/jqd19aI34iZI+/cJvvC1NnagMuGOBc+8i3E+3PvvIuNqUCuSHRwnL1de7h5Y8pLTy2gTiDlKXSiK7oyvZFsZlern/aZLubvf7VkKB1YHzG+hnB9Nv6MdnY4fxUr1gtCa52XkcHDAH4xDL/n6Nuwpr0/QYF5qcgxSy4ayYnj01AmPOSngTAXcmLPFJrrinpLb58KI/6ESQePoCoj98qn9Wl6306y5BDa5xpiAigBFOp4CrwLtHWa8fOzTnR5lThtPWeXpMnlk6zxIR0+b43kYXtb27HJdiz2j5tJ+u1e8KBjLIJKwAIN0bhj/yysKFYu5rDwcw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132)(90676262408878); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046); SRVR:BY2PR0301MB0677; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0677; X-Forefront-PRVS: 0770F75EA9 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0677; 23:ZTvG+ApEYuTB95ASgR0W+GL9YEB03plDs+4A8jFFJqAscVpBrLFVH0yGjAf24dyTgZzsESrgskV5sURMO8R5BSCO4kjXDjHU9I2xRJQ22hfPBs+oEUNJ5ey2q2Gx/1M9ZqP18wL22+9nMFyG+eRFfpPv0sgdlfL2Q9PF0mgTE67pgsBGMAIW0gEB8V69MkVv+C+jyaMLpVTXJQ8G9kjEBUB10mW94KjQ8ggCu/wgon3o6Pilq/ikGe4ffL9f7K4Oirg+aLFBLaQwIwoUVMaQWr08GaDn+BZ0HrD8QgbFENcaXt/UZ8GS4PDR7c3Ua4XD7OkfM9mwDsowFOp46T4IDh48hAPPf2ISdnQIQLOj9h31oOB9kjffi5eGkKKkMnXxqD6tv4ndSxfLwUg5GWGyjvvwcGTWUGApm71USX14hzGQ8tR/WwV3Vcnhn+Abd92lLZVs4wPyMudwml1oRQfsnhXAX8TTiobrvsv89FktuQ+8NTdah15wn8FJk822gUD7jXSczRfuO2TYxU4z/3vr9JB1CAGUKIHJN/+odv2u7Zz7rN9f2LmlB4lEgIeT34J9J6A7rTwGlpxab+BqCroZg7zAaeRB7cD+IMrYUVxAt5q5V/JH1xRZFFnYwgw+apYVhJor96trlsmcdkhK1MQj3rf+Ljc9OgmegDToHnOHyQ58OFe9p2VGtsDcOeLBsx0MUyn44vUCOOcKN8K3Pu1rN0QhJ9JlN7qvKT6G/hA9aKV6dHvafvQaKh0W+JZD5oLJfVk+r5gh3Qaak5kE/kGFDHbVrtOBYcaKqnYTAXGhgOfYCEJJNR1+tsHMPV1+cKEcyHquZLnJyy6xeej0R5Yi2vJ3GGJXz34kTMWVpulcKG4Oa3l3KCCxBAOPUDXG1oWgXcFVz2v5YMTPgXEcjDzqZn5ZLsMVzw3/S/aD+EIeaAUibsfNqw1Z7YWuBe7mHRUw X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0677; 5:fCGK1Gb52b+wmkES/CT2CkD6RqPzf80xQOLh3/4jB8BU7ZXYEG0A1shMPdDIQm6Kcz7RFHJqETSQ0i2bkO+OUuIJHOUdWdFzUBB+J4BMKQ1KWf4YFvBJXQyvgCY0K1ivn+orjepXS3Qp6kdjXVVnNg==; 24:yc/8FGP440wDzUdE6iL0w0T8tWgEvtgzaHMlCEJtCeMyNbwQ4YF54PyQpUOBtk3c3OjDq2LTkoAN8iO5U+wkuAWW8OGocT6jiq3FvthMK98= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2015 08:55:04.7078 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0677 Cc: Marek Vasut , Tom Rini , Joe Hershberger , Max Krummenacher Subject: [U-Boot] [PATCH] common: image-fdt: correct fdt_blob for IMAGE_FORMAT_LEGACY 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" If condition of "(load == image_start || load == image_data)" is true, should use "fdt_addr = load;", but not "fdt_blob = (char *)image_data;", or fdt_blob will be overridden by "fdt_blob = map_sysmem(fdt_addr, 0);" at the end of the switch case. Signed-off-by: Peng Fan Cc: Simon Glass Cc: Joe Hershberger Cc: Max Krummenacher Cc: Marek Vasut Cc: Suriyan Ramasami Cc: Paul Kocialkowski Cc: Tom Rini Reviewed-by: Simon Glass --- common/image-fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 5180a03..5e4e5bd 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -326,7 +326,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch, if (load == image_start || load == image_data) { - fdt_blob = (char *)image_data; + fdt_addr = load; break; }