Merge lp:~gruemaster/flash-kernel/no-mtd into lp:ubuntu/precise/flash-kernel

[Tobin Davis]

Fixes bug 626749.

[Oliver Grawert (ogra)]

looks good, especially that you take into account that the SDP4430 (blaze) only has an eMMC (mmcblk1p1), you should adjust the comment in the blaze section though, but thats not a merge blocker

review: Approve

[Daniel Holbach (dholbach)]

It appears this was merged in a slightly different way.

[Oliver Grawert (ogra)]

line 8-12 seem to have come from a former edit, i merged the latter parts and uploaded though.

=== modified file 'flash-kernel'
--- flash-kernel	2012-01-30 11:56:25 +0000
+++ flash-kernel	2012-03-02 16:57:17 +0000
@@ -682,7 +682,10 @@
 		case $subarch in
 			"mx5"|"mx51")
 				:
-			;;
+			;;				if [ -n "${UBOOT_PART}" ]; then
+					UBOOT_PART=/dev/mmcblk0p1
+				fi
+
 			*)
 				# Not actually the real expected kfile
 				# subarch, but will raise a sensible error
@@ -849,8 +852,19 @@
 			"IGEP v2 board"|"OMAP3 Beagle Board")
 				check_subarch "omap"
 			;;
-			"OMAP4430 4430SDP board" | "OMAP4430 Panda Board" | "OMAP4 Panda board")
-				check_subarch "omap4"
+			"OMAP4430 Panda Board" | "OMAP4 Panda board")
+				check_subarch "omap4"
+				if [ -z "${UBOOT_PART}" ]; then
+					# these boards do not have mtd, only mmc.
+					export UBOOT_PART=/dev/mmcblk0p1
+				fi
+			;;
+			"OMAP4430 4430SDP board")  
+				check_subarch "omap4"
+				if [ -z "${UBOOT_PART}" ]; then
+					# these boards do not have mtd, only mmc.
+					export UBOOT_PART=/dev/mmcblk1p1
+				fi
 			;;
 		esac
 		omap_flash_kernel