summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2016-04-22 17:23:29 +0800
committerDmitry Shmidt <dimitrysh@google.com>2016-05-24 14:21:58 -0700
commitc11dd134ea73ff9ee6bdb2807ac064cef2f284bd (patch)
treedf45e925831149fd8873a534f219d5027431aab2
parentcba8d1f729d830a200055f0a4bab51883304ac9c (diff)
arm64: add option to build Image-dtb
Some bootloaders couldn't decompress Image.gz-dtb. Change-Id: I698cd0c4ee6894e8d0655d88f3ecf4826c28a645 Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--arch/arm64/Makefile2
-rw-r--r--arch/arm64/boot/Makefile3
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index a5c84594f6ad..4e77fd165f38 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -106,7 +106,7 @@ dtbs: prepare scripts
dtbs_install:
$(Q)$(MAKE) $(dtbinst)=$(boot)/dts
-Image.gz-dtb: vmlinux scripts dtbs
+Image-dtb Image.gz-dtb: vmlinux scripts dtbs
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
PHONY += vdso_install
diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile
index ddd405f88344..7ab8e74cd83a 100644
--- a/arch/arm64/boot/Makefile
+++ b/arch/arm64/boot/Makefile
@@ -32,6 +32,9 @@ $(obj)/Image: vmlinux FORCE
$(obj)/Image.bz2: $(obj)/Image FORCE
$(call if_changed,bzip2)
+$(obj)/Image-dtb: $(obj)/Image $(DTB_OBJS) FORCE
+ $(call if_changed,cat)
+
$(obj)/Image.gz: $(obj)/Image FORCE
$(call if_changed,gzip)