From patchwork Thu Apr 14 20:59:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 1035 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:48:28 -0000 Delivered-To: patches@linaro.org Received: by 10.68.59.138 with SMTP id z10cs91008pbq; Thu, 14 Apr 2011 13:59:43 -0700 (PDT) Received: by 10.42.108.73 with SMTP id g9mr1848862icp.250.1302814782563; Thu, 14 Apr 2011 13:59:42 -0700 (PDT) Received: from mail-iw0-f178.google.com (mail-iw0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id e15si5721636icb.90.2011.04.14.13.59.41 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Apr 2011 13:59:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of grant.likely@secretlab.ca) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of grant.likely@secretlab.ca) smtp.mail=grant.likely@secretlab.ca Received: by iwn9 with SMTP id 9so5152791iwn.37 for ; Thu, 14 Apr 2011 13:59:41 -0700 (PDT) Received: by 10.231.31.195 with SMTP id z3mr1053640ibc.182.1302814781773; Thu, 14 Apr 2011 13:59:41 -0700 (PDT) Received: from localhost (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id e9sm1421723ibb.49.2011.04.14.13.59.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Apr 2011 13:59:41 -0700 (PDT) Sender: Grant Likely Received: from [127.0.1.1] (localhost [127.0.0.1]) by localhost (Postfix) with ESMTP id B3488182E08; Thu, 14 Apr 2011 14:59:39 -0600 (MDT) Subject: [PATCH 1/2] arm/dt: Fix broken dtbs rule. To: nicolas.pitre@linaro.org, lorenzo.pieralisi@arm.com, linaro-kernel@lists.linaro.org, patches@linaro.org From: Grant Likely Date: Thu, 14 Apr 2011 14:59:39 -0600 Message-ID: <20110414205939.10689.75468.stgit@ponder> User-Agent: StGit/0.15 MIME-Version: 1.0 On recent make, commit 1449fb96, "arm/dt: Add a make rule to build dtb for enabled boards" breaks build of the kernel immediately: /projects/linaro/linux-2.6/arch/arm/Makefile:292: *** mixed implicit and normal rules. Stop. > $ rpm -q make > make-3.82-4.fc15.x86_64 > > ''The previous behavior of mixing implicit and pattern rules in one line > like that was never supported or documented, but due to a "hole" in the > parser it worked for certain specific cases (for example, reversing that > line so the pattern comes first would not work, nor would adding extra > explicit targets after the pattern target). > > In 3.82, the parser was tightened in this respect and that "hole" was > closed, hence you see this error.'' This patch splits the rule to fix the bug. Reported-by: Andy Green Signed-off-by: Grant Likely --- arch/arm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1be856a..4570ca7 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -289,7 +289,10 @@ zImage Image xipImage bootpImage uImage: vmlinux zinstall uinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ -dtbs %.dtb: +%.dtb: + $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + +dtbs: $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ # We use MRPROPER_FILES and CLEAN_FILES now @@ -308,6 +311,7 @@ define archhelp echo ' uImage - U-Boot wrapped zImage' echo ' bootpImage - Combined zImage and initial RAM disk' echo ' (supply initrd image via make variable INITRD=)' + echo ' dtbs - Build device tree blobs for enabled boards' echo ' install - Install uncompressed kernel' echo ' zinstall - Install compressed kernel' echo ' uinstall - Install U-Boot wrapped compressed kernel'