From patchwork Mon Dec 5 17:47:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5486 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 79B2523E03 for ; Mon, 5 Dec 2011 17:47:54 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5EE15A18155 for ; Mon, 5 Dec 2011 17:47:54 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id m6so427621lag.11 for ; Mon, 05 Dec 2011 09:47:54 -0800 (PST) Received: by 10.152.134.179 with SMTP id pl19mr6769513lab.13.1323107274277; Mon, 05 Dec 2011 09:47:54 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs271321lal; Mon, 5 Dec 2011 09:47:54 -0800 (PST) Received: by 10.14.3.206 with SMTP id 54mr1214329eeh.214.1323107269895; Mon, 05 Dec 2011 09:47:49 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id o16si7421919eea.25.2011.12.05.09.47.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Dec 2011 09:47:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RXcdj-0000Ur-9d; Mon, 05 Dec 2011 17:47:43 +0000 From: Peter Maydell To: android-virt@lists.cs.columbia.edu Cc: Marc Zyngier , Christoffer Dall , patches@linaro.org Subject: [PATCH 6/6] Makefile: Pass unknown targets through to the kernel make Date: Mon, 5 Dec 2011 17:47:43 +0000 Message-Id: <1323107263-1870-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1323107263-1870-1-git-send-email-peter.maydell@linaro.org> References: <1323107263-1870-1-git-send-email-peter.maydell@linaro.org> Add some convenience rules so we pass unknown targets through to the kernel makefile. This allows you to say 'make menuconfig' (for instance) from this directory. Signed-off-by: Peter Maydell --- Makefile | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 160cabd..e1635ea 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,6 @@ clean: rm -f $(IMAGE) boot.o model.lds monitor.o uImage $(KERNEL): $(KERNEL_SRC)/arch/arm/boot/uImage - $(MAKE) -C $(KERNEL_SRC) -j4 uImage cp $< $@ $(IMAGE): boot.o monitor.o model.lds $(KERNEL) $(FILESYSTEM) Makefile @@ -74,4 +73,16 @@ monitor.o: $(MONITOR) model.lds: $(LD_SCRIPT) Makefile $(CC) $(CPPFLAGS) -E -P -C -o $@ $< +$(KERNEL_SRC)/arch/arm/boot/uImage: force + $(MAKE) -C $(KERNEL_SRC) -j4 uImage + +# Pass any target we don't know about through to the kernel makefile. +# This is a convenience rule so we can say 'make menuconfig' etc here. +%: force + $(MAKE) -C $(KERNEL_SRC) $@ + +force: ; + +Makefile: ; + .PHONY: all clean