From patchwork Sat Oct 17 05:35:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 531646 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BD3A51402B2 for ; Sat, 17 Oct 2015 16:36:25 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id A24A91A0B4F for ; Sat, 17 Oct 2015 16:36:25 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0106.outbound.protection.outlook.com [207.46.100.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id C3D401A08A5 for ; Sat, 17 Oct 2015 16:35:28 +1100 (AEDT) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=scottwood@freescale.com; Received: from home.buserror.net (50.157.106.250) by BY1PR03MB1483.namprd03.prod.outlook.com (10.162.210.141) with Microsoft SMTP Server (TLS) id 15.1.300.14; Sat, 17 Oct 2015 05:35:18 +0000 Date: Sat, 17 Oct 2015 00:35:12 -0500 From: Scott Wood To: Hongtao Jia Subject: Re: PowerPC: Move Freescale device tree files into fsl folder Message-ID: <20151017053512.GA24971@home.buserror.net> References: <1442548824-45849-1-git-send-email-hongtao.jia@freescale.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1442548824-45849-1-git-send-email-hongtao.jia@freescale.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [50.157.106.250] X-ClientProxiedBy: BN3PR0601CA0038.namprd06.prod.outlook.com (25.162.30.48) To BY1PR03MB1483.namprd03.prod.outlook.com (25.162.210.141) X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 2:9ck7EdmsPRXQlrxk3vr4GRNZv1Ay4LK2xAl/7FRHd2KAjBML4Sn+afJSJhJcgZAu/XMoDFsPLdLCM7/L/pIEkDWQlQREH3oS2XPBhJPKsJNuWtlKP40U6bS+j1tH8LkqcsImSE1Rcpp89vAjZR+/DsQee4eoTTcvAEE+L61aaxY=; 3:ZKQDnEoyE47Bk2Ia+XGnqf+w+a3MHDdnuTB/gwbCdGagcLFJXVrwZ7q7WM1mn1yKjDx72wtmYLm+RsbLa6Xca7DgotWyho5Met7clIFlee3tqczvNWvQ+YcGzeSiiWWC0e4P6v5s0NolO3S4537fZA==; 25:M0BndyVrKCqlKj4oJAMurpvkrRErKlpCfZQuyKEjlMNLqRY4iCOhrtFC+UDDm9bktZK6p94LLJop4oKlzsyOKVMfGiuLIn0IhlM8MT9DPVpqIUpNGmfdlqilN4I6ej1O6q+y2kVkSVPx/l1sjqLhKzFZcC615gPC0KEvJS6OD2iUraL951gQr/vkeWlvIIKpqQ+3r/8NDcKauX9IO9DMhE5eEpmJV1N1SpSbH73elvC743JZdhnjpP1EdGkq0Mi7u3IApnuSul8oadB003gDHQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1483; X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 20:kt1sbF+NaZoO+sdML13FfD8BAJ1REYyC67i7YwzsRaD7Y4zvbQMTqA8FAPxjjGFcz9ppoLqCDenEt7akc/flNh+mydwi8Fc2rKvroWgpR1gEx1x/dvQV13ZfHEnNWYvqp/nCImH1cmmq/jYocGdQmQuugepmbr362ELx7MpUf/wSJS6eYN2x2UatTsnd7OyvQtc52CoVtRtSzgu2pDNlP/EyuYUooA/wsNYAJ5WZjAfu7sQVbyF5TrxgCQwci7cgIbFc7jEuZfmBFF+FYeckwAvKwu0O3Wlh7XAmpKXWktZW1sjMlNRDMb7J4oNU82RiZL+MYDASmMi1/CZidKVR6gA2FVSmDtbZdOv9byDq6uSbWA27rpkWpWPcVH9bVnYElMUBqXpKJFaEY4mioN80cH7Ha0NzIKKeWcMqRQyI4fZQJpRmjAOyhR0RWtOaUmQ0AxglGz4IaszBDQ6XwRf22GW2mqmx5HuPC62qtWdppi9l5SR/d3mMm7omsdgkvIKU; 4:+pILi+YA1WpCPwNitJwdu0Z+/Wv86Y7S3+38HhHG2qlMN5XpaBoosIUjaiZ/ylKN83lz9yTEFqBva7rGoTB8gEIG59A2MFS0TozNHjQXuwauDN5t0OjAIQbrzzHBth54yEqDWFaF0HFSQMWXRR6PTeA8luk4ua9fOPfepKXMJvigr1zo6FCMbQdLoo/5m1GWUMK+rfOGQprGNTehzZVPBvP6fZBKsjkd/73BQUm0moWr2SLN3G6WDa2gLGMjf6if5LByTd3aHa9Je8kD26m1bWFJRoyKQFfKjHt5iCXngTBjpQhhOSmOBGIgrqGD5YvHKHfsnqu61skLWInOBk3mwj/gAgrU71hbillD8lm+Hkk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001); SRVR:BY1PR03MB1483; BCL:0; PCL:0; RULEID:; SRVR:BY1PR03MB1483; X-Forefront-PRVS: 07326CFBC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(24454002)(46406003)(46102003)(122386002)(19580405001)(19580395003)(23726002)(40100003)(77096005)(189998001)(5004730100002)(5007970100001)(2950100001)(105586002)(101416001)(50466002)(5001960100002)(110136002)(87976001)(42186005)(106356001)(53416004)(69596002)(54356999)(76176999)(83506001)(50986999)(86362001)(81156007)(64706001)(47776003)(4001450100002)(4001350100001)(33656002)(97756001)(97736004)(92566002)(66066001)(5001920100001)(5008740100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR03MB1483; H:home.buserror.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: freescale.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR03MB1483; 23:NSXgxW0k21j0jcXLJT/g5OwATkbIopKghV3Wrj9io?= =?us-ascii?Q?6BugS3nWdShRYYDmH79XrucWzdmVQQ4we0DG3c52xufAhZ+xzmCNXD0WJJ1h?= =?us-ascii?Q?mIzOVYLOVfuQDP8wtqoak5JzwZJ1jcQz7vY4GItVu7LiG/N7IKFrfI0cCzLB?= =?us-ascii?Q?vDTd1wNcuWU7uWedkrOdZYAKpxHFjeJ5diPWz69aZ+7ebTL+fXjbQtriZhPE?= =?us-ascii?Q?eEbhWpmVqh71b/rEa5UCDuvfU3TxqN+BvQfGylLwkTXtBXmiWI4Pic0SQU46?= =?us-ascii?Q?rc6cpqUT3Q2M8hRjCFaSt9PfBgfGgkcnc13By3/zFiYByKTfoDsLT7m1oFP3?= =?us-ascii?Q?7swP3Xe48cDRisHBuLXgjGhQfbO8/55TpfoU2MwwW9erS43fFmxDc80V+YP9?= =?us-ascii?Q?fmBdamTGQFPxWHli6L0fBFhIeqnl5+GaE6REN8gnDqO88rmIxbC1Hl56O64g?= =?us-ascii?Q?6BZMHJnf6t+fJnB1mDVWxWozj12UAeUOkrwD2LD+3Id2v9kAFlfCyDoHjVJd?= =?us-ascii?Q?TI2piLKwCRux9GfEgU9UsuLJFXIsRC2AbACG0LJyC7JQMM2zWZ920phcjQsg?= =?us-ascii?Q?EH6p+ECNfsV4+ZYReOnJ4YEF+4Zod+aZXX6JvqTzQq3pX1h+Wg3qZOlFlybA?= =?us-ascii?Q?ryDTI82hHtQ88/qrzII37B355afbemG0KwDX0puzg7BydlT79vFJonULhWLT?= =?us-ascii?Q?aAdWpk6IjgkLTRFoatnrzA/2edfriMLzFNO1AyXvaAZ2t+Pz4mr6DkQ0sb+I?= =?us-ascii?Q?CBD1bxhwvmeXHTDFZQ43Mne6PIo1evySOB9JnMR5zRlGaCxLOLCdAhMl1bV+?= =?us-ascii?Q?St6yKwQCKs0AbIr+yuVuXFLqxu45VTmaM7agr9J7b95hU3053UjylwaIXMgq?= =?us-ascii?Q?WZmAfwh8bxGEy2fGNml8t9/lW3SAgQ/qfWGQvDxAZcF+NOele7DTbjjiv6PO?= =?us-ascii?Q?y+14zG2K1sUn/y604QnVtcewXvYxYPcjHROjaxW8o/996Wo/Vifrp4ELzNHm?= =?us-ascii?Q?K2WqHeER5qXkuLfY03fqd4sn9sVQNZqj8ytyLnjDpAKFDlEw7gZovf7QzVwx?= =?us-ascii?Q?LsenITQRyWYnk0Cvsg7UpO1aSF6CKb+/wPpChhsJt8LyMdn0CVKLToFYblDD?= =?us-ascii?Q?U+uaVBA9/jDkZzNC9vfTYWKyr8LZgt1Y8lPIjQCTxGy1SW6Ek1Humw7FImQY?= =?us-ascii?Q?dmHPDiVjB7Lf7w=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR03MB1483; 5:GWtD8jiNgBUuyYs0tUrkxRDbjHqiouDsxy/7fYizd6ei1nHet99JhvVIHn7eMB84jVp4FHVHk77weHBDC/bXD06qyBQQUYWdxnX1356kGJp5ZzvzDKv92yivnRaRDbya4rVjDoxWtCTSY2sOpOCCEA==; 24:MWUNpPUFxDrO2khyQQuFWxUrXvgY3KISbkj6utP5ni5XQG3gDTWr6z3Qs9WvnXge6zFvPRIxA11/1JZWF3RjJGljWAB4jgeAM2wec+OBdoY=; 20:0/MzbveDZbEER9aXcQ/GxoiT4P7XLAyl91O96ksytASoXpmquNqF80QgpHkiBd2NKqvvVI081fmXYVpb9ouQCQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2015 05:35:18.3389 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1483 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, robh+dt@kernel.org, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Fri, Sep 18, 2015 at 12:00:24PM +0800, Hongtao Jia wrote: > It makes no sense that some Freescale device tree files are in fsl > directory while some others not. This patch move Freescale device tree > files into fsl folder. To do that the following two steps are made: > - Move Freescale device tree files into fsl folder. > - Update the include path in these files from "fsl/*.dtsi" to "*.dtsi". > > Please add "fsl/" prefix when you make dtb using Makefile. > > Signed-off-by: Jia Hongtao This broke cuImage -- I made this change when applying: -Scott diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 4eec430..99e4487 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -364,6 +364,9 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) $(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb) +$(obj)/cuImage.%: vmlinux $(obj)/fsl/%.dtb $(wrapperbits) + $(call if_changed,wrap,cuboot-$*,,$(obj)/fsl/$*.dtb) + $(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)