summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-12-05 17:47:41 +0000
committerChristoffer Dall <cdall@cs.columbia.edu>2011-12-08 22:11:24 -0500
commit9586ab48898bbce3b9b84b661de5ea501527307b (patch)
treea8d8c6e34c20be007dd6a9d2d0f579dcc54704aa
parentc3a1311f336057cd941c033e0c93f10b502e0a22 (diff)
Makefile: Don't require filesystem.cpio.gz if building non-initrd
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 <peter.maydell@linaro.org>
-rw-r--r--Makefile11
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