aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-12-05 17:47:38 +0000
committerChristoffer Dall <cdall@cs.columbia.edu>2011-12-08 22:11:13 -0500
commite99009564efa9a2b36a6709d742abef0c2d41633 (patch)
treee907bdecd181e4bd75619fd3a15f9d4dfc1f6e58
parent82c93c03db55158406330609d6365df68c5905d2 (diff)
Makefile: Improve $(KERNEL) target
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 <peter.maydell@linaro.org>
-rw-r--r--Makefile6
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