1 files changed, 10 insertions, 2 deletions

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index cebc76a9a9..6b8f1a54b8 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -15,8 +15,12 @@ do_install_append() {
                         DTB_BASE_NAME=`basename ${DTB} .dtb`
                         DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
                         DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+                        DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}"
                         oe_runmake ${DTB}
-                        install -m 0644 ${B}/arch/${ARCH}/boot/${DTB} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb
+                        if [ ! -e "${DTB_PATH}" ]; then
+                                DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}"
+                        fi
+                        install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb
                 done
         fi
 }
@@ -31,8 +35,12 @@ do_deploy_append() {
                         DTB_BASE_NAME=`basename ${DTB} .dtb`
                         DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
                         DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+                        DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}"
+                        if [ ! -e "${DTB_PATH}" ]; then
+                                DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}"
+                        fi
                         install -d ${DEPLOYDIR}
-                        install -m 0644 ${B}/arch/${ARCH}/boot/${DTB} ${DEPLOYDIR}/${DTB_NAME}.dtb
+                        install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.dtb
                         cd ${DEPLOYDIR}
                         ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
                         cd -