ANDROID: 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>
[AmitP: Folded following android-4.9 commit changes into this patch
        56b70ac2447f ("ANDROID: ARM64: Ignore Image-dtb from git point of view")]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 7789279c5027cc14637052c7d5cac031f91472c0..7bea64595661e818e997756efd4ca6567ca8f196 100644 (file)
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -145,7 +145,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/.gitignore b/arch/arm64/boot/.gitignore
index eb3551131b1e7c04930808c2b4834c7fc6f9817e..34e35209fc2ed7b8d21d1306e15fe6563181952c 100644 (file)
--- a/arch/arm64/boot/.gitignore
+++ b/arch/arm64/boot/.gitignore
@@ -1,3 +1,4 @@
 Image
+Image-dtb
 Image.gz
 Image.gz-dtb

diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile
index 5bb65a9e5d136772c6f76ac69620e63f5b3ef267..2c8cb864315e30b238b997e129dcb8fde133d00f 100644 (file)
--- a/arch/arm64/boot/Makefile
+++ b/arch/arm64/boot/Makefile
@@ -34,6 +34,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)