1 files changed, 15 insertions, 1 deletions

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index 92e236a0a4..b77747404f 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -89,6 +89,9 @@ FIT_CONF_PREFIX[doc] = "Prefix to use for FIT configuration node name"
 
 FIT_SUPPORTED_INITRAMFS_FSTYPES ?= "cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio"
 
+# Allow user to select the default DTB for FIT image when multiple dtb's exists.
+FIT_CONF_DEFAULT_DTB ?= ""
+
 # Keys used to sign individually image nodes.
 # The keys to sign image nodes must be different from those used to sign
 # configuration nodes, otherwise the "required" property, from
@@ -412,6 +415,7 @@ fitimage_emit_section_config() {
         bootscr_line=""
         setup_line=""
         default_line=""
+        default_dtb_image="${FIT_CONF_DEFAULT_DTB}"
 
         dtb_image_sect=$(symlink_points_below $dtb_image "${EXTERNAL_KERNEL_DEVICETREE}")
         if [ -z "$dtb_image_sect" ]; then
@@ -462,7 +466,17 @@ fitimage_emit_section_config() {
                 # default node is selected based on dtb ID if it is present,
                 # otherwise its selected based on kernel ID
                 if [ -n "$dtb_image" ]; then
-                        default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";"
+                        # Select default node as user specified dtb when
+                        # multiple dtb exists.
+                        if [ -n "$default_dtb_image" ]; then
+                                if [ -s "${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image" ]; then
+                                        default_line="default = \"${FIT_CONF_PREFIX}$default_dtb_image\";"
+                                else
+                                        bbwarn "Couldn't find a valid user specified dtb in ${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image"
+                                fi
+                        else
+                                default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";"
+                        fi
                 else
                         default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";"
                 fi