--- trunk/grubby/new-kernel-pkg	2012/04/16 17:51:27	1803
+++ trunk/grubby/new-kernel-pkg	2012/07/02 13:07:56	1848
@@ -112,12 +112,11 @@
 	lilo=/sbin/zipl
 	runLilo="yes"
 	isx86=""
-elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
+elif [[ ${ARCH} =~ armv[5|7].*l ]]
 then
-	machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
 	liloConfig=""
 	bootPrefix=/boot
-	ubootDir=${UBOOT_DIR:-"/boot/uboot"}
+	ubootDir=${UBOOT_DIR:-"/boot"}
 	ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
 	ubootKList=${UBOOT_KLIST:-"klist.txt"}
 	ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
@@ -126,11 +125,21 @@
 	mounted=""
 	liloFlag=""
 	isx86=""
-	if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]
+	if [[ -z ${UBOOT_IMGADDR} ]]
 	then
-		ubootAddress=0x80008000
+		machine=${MACHINE:-$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')}
+		# A few machines use an alternate kernel load address
+		if [[ "${machine}" =~ ^OMAP[3|4].* ]]
+		then
+			ubootAddress=0x80008000
+		elif [[ "${machine}" =~ ^Efika\ MX.* ]]
+		then
+			ubootAddress=0x90008000
+		else
+			ubootAddress=0x00008000
+		fi
 	else
-		ubootAddress=0x00008000
+		ubootAddress="${UBOOT_IMGADDR}"
 	fi
 else
 	# this leaves i?86 and x86_64
@@ -406,7 +415,7 @@
 		then
 			tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
 			curversion=$(tail -n1 ${ubootDir}/${ubootKList})
-			sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}
+			sed "/$version$/d" ${ubootDir}/${ubootKList} > ${tmpKList}
 			newversion=$(tail -n1 ${tmpKList})
 			if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
 			then