Merge lp:~paulliu/flash-kernel/mx5 into lp:ubuntu/natty/flash-kernel

[Ying-Chun Liu]

Hi,

For IMX platform,
we've change the subarch from "imx51" to "mx51".

Please consider including this patch.

Kindly Regards,
Paul

[Loïc Minier (lool)]

Are there no installed system and no in archive kernels with -imx5? If there are any, please keep support for it and just add support for -mx5 on top of -imx5 + -mx51.

Could you explain the reason for the boot.scr related changes? Is it possible that some boot.scr be left in the old /boot location after this upgrade?

review: Approve

[Ying-Chun Liu (paulliu)]

Hi Loic,

The -imx5 kernel only appears in a private PPA for early test purpose. There's no public machines that use that kernel flavor. Few weeks ago we decide to use "mx5" for freescale SoCs instead of the previous "imx5". So in the public PPA for Freescale Landing team there's only -mx5 kernel. We'll use that for Linaro hwpacks release. The bug number is LP:744021 (private bug report).

For boot.scr, it's just an optional for debug/test. It's because we don't have /boot/boot.scripts before so there won't be any boot.scr generated under /boot. So there won't be any boot.scr left in the old system.

Regards,
Paul

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-30 09:55:48 +0000
+++ debian/changelog	2011-04-15 07:41:11 +0000
@@ -1,3 +1,10 @@
+flash-kernel (2.28ubuntu19) natty; urgency=low
+
+  * IMX: Use mx5 as subarch name.
+  * IMX: Add support for customization /boot/boot.script
+
+ -- Ying-Chun Liu (PaulLiu) <[e-mail]>  Fri, 15 Apr 2011 15:11:40 +0800
+
 flash-kernel (2.28ubuntu18) natty; urgency=low
 
   * match omap4 hardware on "OMAP4 Panda board" as well (LP: #744862)
 
=== modified file 'flash-kernel'
--- flash-kernel	2011-03-30 09:55:18 +0000
+++ flash-kernel	2011-04-15 07:41:11 +0000
@@ -402,10 +402,12 @@
 	rm -f "$tmp"
 
 	if [ -e /boot/boot.script ];then
-		mv $TMPMOUNT/boot.scr $TMPMOUNT/boot.scr.bak
+		if [ -e $TMPMOUNT/boot.scr ]; then
+			mv $TMPMOUNT/boot.scr $TMPMOUNT/boot.scr.bak
+		fi
 		printf "Generating u-boot configuration from /boot/boot.script... " >&2
 		mkimage -A arm -T script -C none -n "Ubuntu boot script" -d /boot/boot.script \
-			/boot/boot.scr >&2 1>/dev/null
+			$TMPMOUNT/boot.scr >&2 1>/dev/null
 		echo "done." >&2
 	fi
 
@@ -628,20 +630,20 @@
 	;;
 	"Freescale MX51 Babbage Board")
 		case $subarch in
-			"imx5"|"mx51")
+			"mx5"|"mx51")
 				:
 			;;
 			*)
 				# Not actually the real expected kfile
 				# subarch, but will raise a sensible error
-				check_subarch "imx5 or mx51"
+				check_subarch "mx5 or mx51"
 			;;
 		esac
 		IMX_KERNEL_ADDR=0x90008000
 		imx_flash_kernel
 	;;
 	"Freescale MX53 LOCO Board")
-		check_subarch "imx5"
+		check_subarch "mx5"
 		IMX_KERNEL_ADDR=0x70008000
 		imx_flash_kernel
 	;;