summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-01-31 16:24:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-13 12:19:14 +0000
commitc9ab7b0d22cba58af134d05de2545d771d122f7e (patch)
tree198a2d0a1b7451a41429e318f4a379c937deac5e /meta
parentba279900933d2399eb722bd01f140f7fb4d79c07 (diff)
downloadpoky-c9ab7b0d22cba58af134d05de2545d771d122f7e.tar.gz
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. (From OE-Core rev: 169ebd59f11845a3a5a7157719217ccf0844e448) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-fitimage.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index ec18a3d699..d1b8cdc1f0 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -391,11 +391,10 @@ fitimage_assemble() {
391 391
392 if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then 392 if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
393 dtbcount=1 393 dtbcount=1
394 for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do 394 for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n'); do
395 DTB=`basename ${DTBFILE}`
396 DTB=$(echo "${DTB}" | tr '/' '_') 395 DTB=$(echo "${DTB}" | tr '/' '_')
397 DTBS="${DTBS} ${DTB}" 396 DTBS="${DTBS} ${DTB}"
398 fitimage_emit_section_dtb ${1} ${DTB} ${DTBFILE} 397 fitimage_emit_section_dtb ${1} ${DTB} "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}"
399 done 398 done
400 fi 399 fi
401 400