From patchwork Fri Apr 8 05:49:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 933 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:47:32 -0000 Delivered-To: patches@linaro.org Received: by 10.68.52.132 with SMTP id t4cs144372pbo; Thu, 7 Apr 2011 22:45:16 -0700 (PDT) Received: by 10.42.222.5 with SMTP id ie5mr2660609icb.331.1302241516103; Thu, 07 Apr 2011 22:45:16 -0700 (PDT) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id uf9si1708769icb.85.2011.04.07.22.45.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 07 Apr 2011 22:45:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by iyi12 with SMTP id 12so3968601iyi.37 for ; Thu, 07 Apr 2011 22:45:14 -0700 (PDT) Received: by 10.43.65.11 with SMTP id xk11mr2574320icb.266.1302241514337; Thu, 07 Apr 2011 22:45:14 -0700 (PDT) Received: from localhost.localdomain ([114.216.155.131]) by mx.google.com with ESMTPS id y10sm1630053iba.63.2011.04.07.22.45.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 07 Apr 2011 22:45:13 -0700 (PDT) From: Shawn Guo To: linaro-kernel@lists.linaro.org Cc: patches@linaro.org, Shawn Guo Subject: [PATCH] arm/dt: Fix the mixing implicit and pattern rules for dtb Date: Fri, 8 Apr 2011 13:49:43 +0800 Message-Id: <1302241783-8137-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <4D9D67FB.5010106@linaro.org> References: <4D9D67FB.5010106@linaro.org> Mixing implicit and pattern rules in one line works for make 3.81 as a 'hole' in the parser for certain specific cases. In 3.82, the parser was tightened in this respect and that "hole" was closed, hence the mixing of rules "dtbs %.dtb:" causes the following error. [path]/arch/arm/Makefile:292: *** mixed implicit and normal rules. Stop. The patch is to fix the error by writing the mixing rules into two. Reported-by: Andy Green Signed-off-by: Shawn Guo --- arch/arm/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1be856a..bb797e4 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