aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-02 16:56:33 +0200
committerAmit Pundir <amit.pundir@linaro.org>2013-07-25 07:51:26 +0530
commitac0b8b350ccf4d3cf40665a47df3d3955e357e3c (patch)
tree79a5e0225ce85161f025db2f72e60f6de1cb05d8
parent5a5c9d2c74361262102f76cfbdbd37e6aecda9da (diff)
downloadbuild-ac0b8b350ccf4d3cf40665a47df3d3955e357e3c.tar.gz
build: Make sure boot.img depends on the kernel having been built
Change-Id: Ia439ed4079ef912c42aa15cac995741fd6071f1e Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--core/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile
index 729df99ecd..fde65fd4c1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -421,13 +421,13 @@ ifeq ($(TARGET_BOOTIMAGE_USE_EXT2),true)
tmp_dir_for_image := $(call intermediates-dir-for,EXECUTABLES,boot_img)/bootimg
INTERNAL_BOOTIMAGE_ARGS += --tmpdir $(tmp_dir_for_image)
INTERNAL_BOOTIMAGE_ARGS += --genext2fs $(MKEXT2IMG)
-$(INSTALLED_BOOTIMAGE_TARGET): $(MKEXT2IMG) $(INTERNAL_BOOTIMAGE_FILES)
+$(INSTALLED_BOOTIMAGE_TARGET): $(MKEXT2IMG) $(INTERNAL_BOOTIMAGE_FILES) $(INSTALLED_KERNEL_TARGET)
$(call pretty,"Target boot image: $@")
$(hide) $(MKEXT2BOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@
else # TARGET_BOOTIMAGE_USE_EXT2 != true
-$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)
+$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(INSTALLED_KERNEL_TARGET)
$(call pretty,"Target boot image: $@")
$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@
$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)