2 files changed, 19 insertions, 5 deletions

diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index b4338da1b1..11b57adc92 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -6,7 +6,12 @@ python () {
             d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-image-zimage-bundle")
 }
 
-FILES:${KERNEL_PACKAGE_NAME}-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo"
+FILES:${KERNEL_PACKAGE_NAME}-devicetree = " \
+    /${KERNEL_DTBDEST}/*.dtb \
+    /${KERNEL_DTBDEST}/*.dtbo \
+    /${KERNEL_DTBDEST}/*/*.dtb \
+    /${KERNEL_DTBDEST}/*/*.dtbo \
+"
 FILES:${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin"
 
 # Generate kernel+devicetree bundle
@@ -67,12 +72,16 @@ do_compile:append() {
 }
 
 do_install:append() {
+        install -d ${D}/${KERNEL_DTBDEST}
         for dtbf in ${KERNEL_DEVICETREE}; do
                 dtb=`normalize_dtb "$dtbf"`
-                dtb_ext=${dtb##*.}
-                dtb_base_name=`basename $dtb .$dtb_ext`
                 dtb_path=`get_real_dtb_path_in_kernel "$dtb"`
-                install -m 0644 $dtb_path ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext
+                if [ ${KERNEL_DTBVENDORED} == "false" ]; then
+                        dtb_ext=${dtb##*.}
+                        dtb_base_name=`basename $dtb .$dtb_ext`
+                        dtb=$dtb_base_name.$dtb_ext
+                fi
+                install -Dm 0644 $dtb_path ${D}/${KERNEL_DTBDEST}/$dtb
         done
 }
 
@@ -82,7 +91,10 @@ do_deploy:append() {
                 dtb_ext=${dtb##*.}
                 dtb_base_name=`basename $dtb .$dtb_ext`
                 install -d $deployDir
-                install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext
+                if [ ${KERNEL_DTBVENDORED} == "false" ]; then
+                        dtb=$dtb_base_name.$dtb_ext
+                fi
+                install -m 0644 ${D}/${KERNEL_DTBDEST}/$dtb $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext
                 if [ "${KERNEL_IMAGETYPE_SYMLINK}" = "1" ] ; then
                         ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name.$dtb_ext
                 fi
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index d45fa25c32..87dd46e6fa 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -210,6 +210,8 @@ KERNEL_RELEASE ?= "${KERNEL_VERSION}"
 # The directory where built kernel lies in the kernel tree
 KERNEL_OUTPUT_DIR ?= "arch/${ARCH}/boot"
 KERNEL_IMAGEDEST ?= "boot"
+KERNEL_DTBDEST ?= "${KERNEL_IMAGEDEST}"
+KERNEL_DTBVENDORED ?= "false"
 
 #
 # configuration