--- trunk/grubby/new-kernel-pkg	2016/06/30 10:17:00	2972
+++ trunk/grubby/new-kernel-pkg	2016/06/30 10:22:14	2973
@@ -904,12 +904,16 @@
 
 if [[ ${ARCH} =~ armv[5|7].*l ]]
 then
-	if [ -d ${bootPrefix}/dtb-${version}/ ]
+	if [[ -z ${SHIPSDTB} ]] || [[ ${SHIPSDTB} != yes ]]
 	then
-		devtreedir="${bootPrefix}/dtb-${version}/"
-		if [[ -n ${dtbfile} ]] && [ -f ${devtreedir}/${dtbfile} ]
+		if [[ -n ${dtbfile} ]] && [ -f ${bootPrefix}/dtb-${version}/${dtbfile} ]
 		then
-			devtreefile="${devtreedir}/${dtbfile}"
+			devtreefile="${bootPrefix}/dtb-${version}/${dtbfile}"
+			[[ -n ${verbose} ]] && echo "devtreefile is ${devtreefile}"
+		elif [ -d ${bootPrefix}/dtb-${version}/ ]
+		then
+			devtreedir="${bootPrefix}/dtb-${version}/"
+			[[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
 		fi
 	fi
 fi