--- trunk/grubby/new-kernel-pkg	2012/07/02 12:50:07	1842
+++ trunk/grubby/new-kernel-pkg	2012/07/02 12:58:29	1843
@@ -114,7 +114,6 @@
 	isx86=""
 elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
 then
-	machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
 	liloConfig=""
 	bootPrefix=/boot
 	ubootDir=${UBOOT_DIR:-"/boot/uboot"}
@@ -126,11 +125,17 @@
 	mounted=""
 	liloFlag=""
 	isx86=""
-	if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]
+	if [[ -z ${UBOOT_IMGADDR} ]]
 	then
-		ubootAddress=0x80008000
+		machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
+		if [ "${machine}" == "OMAP3 Beagle Board" ] || [ "${machine}" == "OMAP4 Panda board" ]
+		then
+			ubootAddress=0x80008000
+		else
+			ubootAddress=0x00008000
+		fi
 	else
-		ubootAddress=0x00008000
+		ubootAddress="${UBOOT_IMGADDR}"
 	fi
 else
 	# this leaves i?86 and x86_64