kernel-fitimage: Handle overlays in EXTERNAL_KERNEL_DEVICETREE

When using EXTERNAL_KERNEL_DEVICETREE, collect DTB overlays too (*.dtbo)
as well as iterating down into sub-directories so using the behaviour
for naming which matches KERNEL_DEVICETREE.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index ec18a3d69921c16e39fd279f92b8c06cdaf48575..d1b8cdc1f049029d154f6f5cc7fa0107025ef7c7 100644 (file)
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -391,11 +391,10 @@ fitimage_assemble() {
 
        if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
                dtbcount=1
-               for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do
-                       DTB=`basename ${DTBFILE}`
+               for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do
                        DTB=$(echo "${DTB}" | tr '/' '_')
                        DTBS="${DTBS} ${DTB}"
-                       fitimage_emit_section_dtb ${1} ${DTB} ${DTBFILE}
+                       fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}"
                done
        fi