From patchwork Mon Dec 5 17:47:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 5482 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 4B7CC23E03 for ; Mon, 5 Dec 2011 17:47:52 +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 31077A18155 for ; Mon, 5 Dec 2011 17:47:52 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id m6so427621lag.11 for ; Mon, 05 Dec 2011 09:47:52 -0800 (PST) Received: by 10.152.106.115 with SMTP id gt19mr6735858lab.27.1323107272092; Mon, 05 Dec 2011 09:47:52 -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 h6cs271309lal; Mon, 5 Dec 2011 09:47:50 -0800 (PST) Received: by 10.180.92.169 with SMTP id cn9mr13528895wib.62.1323107266134; 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 ep6si10966229wbb.137.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-0000Un-8U; 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 4/6] Makefile: Don't require filesystem.cpio.gz if building non-initrd Date: Mon, 5 Dec 2011 17:47:41 +0000 Message-Id: <1323107263-1870-5-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> Introduce a USE_INITRD switch so we can avoid requiring the user to touch a pointless filesystem.cpio.gz if they're not using an initrd. Signed-off-by: Peter Maydell --- Makefile | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 38f1df6..0e07bf1 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,19 @@ # found in the LICENSE.txt file. CPPFLAGS += -DSMP -#CPPFLAGS += -DUSE_INITRD #CPPFLAGS += -DTHUMB2_KERNEL CPPFLAGS += -march=armv7-a CPPFLAGS += -DVEXPRESS +# Turn this on to use an initrd whose contents are in filesystem.cpio.gz +USE_INITRD = no +ifeq ($(USE_INITRD),yes) +CPPFLAGS += -DUSE_INITRD +FILESYSTEM = filesystem.cpio.gz +else +FILESYSTEM = +endif + # MPS (Cortex-M3) definitions #CPPFLAGS += -DMACH_MPS -DTHUMB2_KERNEL #CPPFLAGS += -march=armv7-m @@ -20,7 +28,6 @@ MONITOR = monitor.S BOOTLOADER = boot.S KERNEL_SRC = ../linux-kvm-arm KERNEL = uImage -FILESYSTEM = filesystem.cpio.gz IMAGE = linux-system.axf LD_SCRIPT = model.lds.S