Merge lp:~mwaddel/ubuntu/maverick/flash-kernel/vexpress-support into lp:ubuntu/maverick/flash-kernel

[Matt Waddel]

Adds support for the ARM Versatile Express platform. This platform uses NOR flash so adding the kernel and initrd support simply required writing to the correct mtd partition.

=== modified file 'README'
--- README	2010-05-06 12:32:59 +0000
+++ README	2010-09-23 16:50:55 +0000
@@ -21,6 +21,7 @@
 
 At the moment, the following systems are supported:
 
+ - ARM-Versatile Express CA9x4
  - Buffalo Linkstation Live
  - Buffalo Linkstation Pro
  - Buffalo/Revogear Kurobox Pro

=== modified file 'flash-kernel'
--- flash-kernel	2010-09-23 08:48:43 +0000
+++ flash-kernel	2010-09-23 16:50:55 +0000
@@ -310,6 +310,7 @@
 	fi
 
 	case "$machine" in
+		"ARM-Versatile Express CA9x4")		exit 0 ;;
 		"Buffalo Linkstation Pro/Live")		exit 0 ;;
 		"Buffalo/Revogear Kurobox Pro")		exit 0 ;;
 		"D-Link DNS-323")			exit 0 ;;
@@ -378,6 +379,42 @@
 subarch=$(echo "$kfile" | sed -e 's/.*-//')
 
 case "$machine" in
+	"ARM-Versatile Express CA9x4")
+		check_subarch "vexpress"
+		check_mtd
+
+		kmtd=$(mtdblock "kernel")
+		if [ -z "$kmtd" ]; then
+			error "Cannot find mtd partition 'kernel'"
+		fi
+		check_dev_mtdblock "$kmtd"
+		kmtdsize=$(mtdsize "kernel")
+		check_size "kernel" $(($kfilesize + 64)) $kmtdsize
+		printf "Generating a u-boot compatible kernel image... " >&2
+		mkimage -A arm -O linux -T kernel -C none -a 0x60008000 \
+			-e 0x60008000 -n "$desc" -d $kfile $kfile.uboot \
+			>&2 1>/dev/null
+		printf "Writing kernel to flash... " >&2
+		cat $kfile.uboot > $kmtd || error "failed."
+		echo "done." >&2
+		rm -f $kfile.uboot
+
+		imtd=$(mtdblock "initrd")
+		if [ -z "$imtd" ]; then
+			error "Cannot find mtd partition for initrd"
+		fi
+		check_dev_mtdblock "$imtd"
+		imtdsize=$(mtdsize "initrd")
+		check_size "initrd" $ifilesize $imtdsize 
+		printf "Generating u-boot compatible initrd image... " >&2
+		mkimage -A arm -O linux -T ramdisk -C none -a 0x81000000 \
+			-e 0x81000000 -n "$idesc" -d $ifile $ifile.uboot \
+			>&2 1>/dev/null
+		printf "Writing initrd to flash... " >&2
+		cat $ifile.uboot > $imtd || error "failed."
+		echo "done." >&2 
+		rm -f $ifile.uboot
+	;;
 	"Buffalo Linkstation Pro/Live" | "Buffalo/Revogear Kurobox Pro")
 		check_subarch "orion5x"
 		tmp="$(tempfile)"