summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--arch/arm64/Makefile3
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e227452137bc..2b1e4601399f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ Module.symvers
#
# Top-level generic files
#
+/boot.img
/kernel.img
/resource.img
/tags
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 797ee12905d9..53cde97203a2 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -177,3 +177,6 @@ LOGO_KERNEL := $(notdir $(wildcard $(srctree)/logo_kernel.bmp))
$(Q) if [ -f $(srctree)/$(LOGO_KERNEL) -a "$(srctree)" != "$(objtree)" ]; then cp -a $(srctree)/$(LOGO_KERNEL) $(objtree)/; fi
$(Q)$(srctree)/scripts/resource_tool $(objtree)/arch/arm64/boot/dts/rockchip/$*.dtb $(LOGO) $(LOGO_KERNEL)
@echo ' Image: resource.img (with $*.dtb $(LOGO) $(LOGO_KERNEL)) is ready'
+ $(Q) if [ -x $(srctree)/scripts/mkbootimg ]; then $(srctree)/scripts/mkbootimg --kernel $(objtree)/arch/arm64/boot/Image --second resource.img -o boot.img && echo ' Image: boot.img (with Image resource.img) is ready'; fi
+
+CLEAN_FILES += boot.img kernel.img resource.img