kernel: append DTB to kernel imagesumo-test

Instead of using dtbTool to create a DT image , and include it into the boot
image, we append DTB to the compressed kernel image. the LK bootloader knows how
to retrieve DTB , when they are appeneded to compressed kernel image.

Note:
* it only works with compressed image.
* dtbToo also typically adds msm-ids into the DTB, recent versions of LK exist
that allow a single DTB to be used without the msm-ids, in which case it will
work fine. when using older LK version, it is needed to patch the kernel and
include the msm-ids.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
(cherry picked from commit 4c4994c05053e73eac3622ab6f793db3eb8dbed3)
(cherry picked from commit ae07326b0fc16237ade9d8447b96da445eb7bbf8)

1 files changed, 5 insertions, 5 deletions

diff --git a/recipes-kernel/linux/linux-linaro-qcom.inc b/recipes-kernel/linux/linux-linaro-qcom.inc
index 2b3a3ea..cabf17d 100644
--- a/recipes-kernel/linux/linux-linaro-qcom.inc
+++ b/recipes-kernel/linux/linux-linaro-qcom.inc
@@ -82,12 +82,12 @@ do_configure_prepend() {
         oe_runmake -C ${S} O=${B} savedefconfig && cp ${B}/defconfig ${WORKDIR}/defconfig.saved
 }
 
-# append DTB, since bootloader doesn't support DTB
-do_compile_append_apq8064() {
+# append DTB
+do_compile_append() {
     if ! [ -e ${B}/arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE} ] ; then
         oe_runmake ${KERNEL_DEVICETREE}
     fi
-    cp arch/${ARCH}/boot/zImage arch/${ARCH}/boot/zImage.backup
-    cat arch/${ARCH}/boot/zImage.backup arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE} > arch/${ARCH}/boot/zImage
-    rm -f arch/${ARCH}/boot/zImage.backup
+    cp arch/${ARCH}/boot/${KERNEL_IMAGETYPE} arch/${ARCH}/boot/${KERNEL_IMAGETYPE}.backup
+    cat arch/${ARCH}/boot/${KERNEL_IMAGETYPE}.backup arch/${ARCH}/boot/dts/${KERNEL_DEVICETREE} > arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+    rm -f arch/${ARCH}/boot/${KERNEL_IMAGETYPE}.backup
 }