aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2016-04-22 17:23:29 +0800
committerAmit Pundir <amit.pundir@linaro.org>2016-10-28 23:12:35 +0800
commite47076225348156f5f8b21fc12884a420e7eb852 (patch)
tree957973a670e7e63b510bd62f6b577c662f87de76
parente8a799eba37e52bc9c43879ec6b91e4c7e9ddbe1 (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 3a583c0e01ac..c744dab260ac 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -94,7 +94,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 71f513face11..aa24ed42b42b 100644
--- a/arch/arm64/boot/Makefile
+++ b/arch/arm64/boot/Makefile
@@ -29,6 +29,9 @@ endif
$(obj)/Image: vmlinux FORCE
$(call if_changed,objcopy)
+$(obj)/Image-dtb: $(obj)/Image $(DTB_OBJS) FORCE
+ $(call if_changed,cat)
+
$(obj)/Image.gz: $(obj)/Image FORCE
$(call if_changed,gzip)