--- trunk/grubby/new-kernel-pkg	2012/07/02 13:04:02	1847
+++ trunk/grubby/new-kernel-pkg	2012/07/02 13:07:56	1848
@@ -112,7 +112,7 @@
 	lilo=/sbin/zipl
 	runLilo="yes"
 	isx86=""
-elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
+elif [[ ${ARCH} =~ armv[5|7].*l ]]
 then
 	liloConfig=""
 	bootPrefix=/boot
@@ -127,10 +127,14 @@
 	isx86=""
 	if [[ -z ${UBOOT_IMGADDR} ]]
 	then
-		machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
-		if [ "${machine}" == "OMAP3 Beagle Board" ] || [ "${machine}" == "OMAP4 Panda board" ]
+		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