1 files changed, 8 insertions, 0 deletions

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 7e09b075ff..56d71ba8fa 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -527,6 +527,10 @@ fitimage_assemble() {
                         fi
 
                         DTB=$(echo "$DTB" | tr '/' '_')
+
+                        # Skip DTB if we've picked it up previously
+                        echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
+
                         DTBS="$DTBS $DTB"
                         fitimage_emit_section_dtb $1 $DTB $DTB_PATH
                 done
@@ -536,6 +540,10 @@ fitimage_assemble() {
                 dtbcount=1
                 for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do
                         DTB=$(echo "$DTB" | tr '/' '_')
+
+                        # Skip DTB if we've picked it up previously
+                        echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
+
                         DTBS="$DTBS $DTB"
                         fitimage_emit_section_dtb $1 $DTB "${EXTERNAL_KERNEL_DEVICETREE}/$DTB"
                 done