1 files changed, 14 insertions, 6 deletions

diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index a50ea4fb67..c8aaf7458f 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -83,21 +83,29 @@ do_deploy:append() {
                 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
-                ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name.$dtb_ext
-                ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_LINK_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
+                if [ -n "${KERNEL_DTB_LINK_NAME}" ] ; then
+                        ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
+                fi
                 for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
                         if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
                                 cat ${D}/${KERNEL_IMAGEDEST}/$type \
                                         $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
                                         > $deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
-                                ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
-                                        $deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+                                if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
+                                        ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
+                                                $deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+                                fi
                                 if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
                                         cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \
                                                 $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
                                                 >  $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
-                                        ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
-                                                $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+                                        if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
+                                                ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
+                                                        $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+                                        fi
                                 fi
                         fi
                 done