From patchwork Mon Dec 5 17:47:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5483 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 3826123E03 for ; Mon, 5 Dec 2011 17:47:53 +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 1D828A18155 for ; Mon, 5 Dec 2011 17:47:53 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id m6so427621lag.11 for ; Mon, 05 Dec 2011 09:47:53 -0800 (PST) Received: by 10.152.104.206 with SMTP id gg14mr6719109lab.41.1323107273016; Mon, 05 Dec 2011 09:47:53 -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 h6cs271311lal; Mon, 5 Dec 2011 09:47:52 -0800 (PST) Received: by 10.213.32.78 with SMTP id b14mr822306ebd.41.1323107266324; Mon, 05 Dec 2011 09:47:46 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id v9si19506646bkd.113.2011.12.05.09.47.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Dec 2011 09:47:46 -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-0000Ug-6l; 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 1/6] Makefile: Improve $(KERNEL) target Date: Mon, 5 Dec 2011 17:47:38 +0000 Message-Id: <1323107263-1870-2-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> Minor tweaks to the $(KERNEL) target: * use $(MAKE) so -n &c work better * depend on the uImage which we use, not the zImage which we don't * use automatic variables to avoid repeating the path to uImage * drop unnecessary separate cd * fix stray direct use of "../linux-kvm-arm" Signed-off-by: Peter Maydell --- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6dc9912..3d74ac0 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ all: $(IMAGE) clean: rm -f $(IMAGE) boot.o model.lds monitor.o uImage -$(KERNEL): ../linux-kvm-arm/arch/arm/boot/zImage - cd $(KERNEL_SRC); make -j4 uImage - cp $(KERNEL_SRC)/arch/arm/boot/uImage $(KERNEL) +$(KERNEL): $(KERNEL_SRC)/arch/arm/boot/uImage + $(MAKE) -C $(KERNEL_SRC) -j4 uImage + cp $< $@ $(IMAGE): boot.o monitor.o model.lds $(KERNEL) $(FILESYSTEM) Makefile $(LD) -o $@ --script=model.lds