summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2012-03-19 12:12:01 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2012-03-19 12:12:01 +0530
commitfbcdbc7cbca9c144c0549fc06596bfb197898767 (patch)
tree5e9e16514ad5e4e4d1613b9e0d63e290b2e9dd0e
parent365621de183b2d5739b58f4ee0a78ef87fffcdf2 (diff)
config-default.mk: add support for prebuilt kernelandroid
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--Makefile7
-rw-r--r--config-default.mk4
2 files changed, 11 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ebcbce5..4f1dc7d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,13 @@ all: $(IMAGE) $(SEMIIMG)
clean:
rm -f $(IMAGE) boot.o model.lds monitor.o uImage
+ifeq ($(USE_PREBUILT_KERNEL),no)
$(KERNEL): $(KERNEL_SRC)/arch/arm/boot/uImage
cp $< $@
+else
+$(KERNEL):
+
+endif
$(IMAGE): boot.o monitor.o model.lds $(KERNEL) $(FILESYSTEM) Makefile
$(LD) -o $@ --script=model.lds
@@ -57,6 +62,7 @@ model.lds: $(LD_SCRIPT) Makefile
modelsemi.lds: $(LD_SCRIPT) Makefile
$(CC) $(CPPFLAGS) -DSEMIHOSTING=1 -E -P -C -o $@ $<
+ifeq ($(USE_PREBUILT_KERNEL),no)
$(KERNEL_SRC)/arch/arm/boot/uImage: force
$(MAKE) -C $(KERNEL_SRC) -j4 uImage
@@ -64,6 +70,7 @@ $(KERNEL_SRC)/arch/arm/boot/uImage: force
# This is a convenience rule so we can say 'make menuconfig' etc here.
%: force
$(MAKE) -C $(KERNEL_SRC) $@
+endif
force: ;
diff --git a/config-default.mk b/config-default.mk
index 6c73934..aa33f7b 100644
--- a/config-default.mk
+++ b/config-default.mk
@@ -25,6 +25,10 @@ KERNEL_SRC ?= ../linux-kvm-arm
SYSTEM ?= vexpress
###########################################################################
+# Turn this on to use a prebuilt kernel image
+USE_PREBUILT_KERNEL ?= no
+
+###########################################################################
# Turn this on to use an initrd whose contents are in filesystem.cpio.gz
USE_INITRD ?= no
ifeq ($(USE_INITRD),yes)