--- trunk/grubby/new-kernel-pkg	2016/06/29 14:52:33	2965
+++ trunk/grubby/new-kernel-pkg	2016/06/30 10:06:57	2971
@@ -352,7 +352,7 @@
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
 
 		ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
-			${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
+			${DEVTREE} ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
 			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
 			${mbargs:+--mbargs=\"${mbargs}\"} \
 			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
@@ -505,6 +505,13 @@
 		fi
 	fi
 
+	DEVTREE=""
+	if [[ x${devtreefile} != x ]] && [ -f ${devtreefile} ]
+	then
+		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
+		DEVTREE="--devtree ${devtreefile}"
+	fi
+
 	if [[ -n ${cfgGrub} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
@@ -607,7 +614,7 @@
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
 		ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
-			${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
+			${DEVTREE} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
 			${removeargs:+--remove-args=\"${removeargs}\"} \
 			--title=\"${title}\${debugtitle}\""
 		rungrubby --debug ${ARGS}
@@ -870,6 +877,19 @@
 fi
 [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
 
+if [[ ${ARCH} =~ armv[5|7].*l ]]
+then
+	if [ -d ${bootPrefix}/dtb-${version}/ ]
+	then
+		devtreedir="${bootPrefix}/dtb-${version}/"
+		if [[ -n ${dtbfile} ]] && [ -f ${devtreedir}/${dtbfile} ]
+		then
+			devtreefile="${devtreedir}/${dtbfile}"
+		fi
+	fi
+fi
+[[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
+
 # add dracut i18n, keyboard and plymouth kernel args if requested
 if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
 then