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

Proposed by Ying-Chun Liu
Status: Merged
Merged at revision: 398
Proposed branch: lp:~paulliu/flash-kernel/mx5
Merge into: lp:ubuntu/natty/flash-kernel
Diff against target: 57 lines (+14/-5)
2 files modified
debian/changelog (+7/-0)
flash-kernel (+7/-5)
To merge this branch: bzr merge lp:~paulliu/flash-kernel/mx5
Reviewer Review Type Date Requested Status
Loïc Minier Approve
Ubuntu branches Pending
Review via email: mp+57818@code.launchpad.net

Description of the change

Hi,

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

Please consider including this patch.

Kindly Regards,
Paul

To post a comment you must log in.
Loïc Minier (lool) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-30 09:55:48 +0000
3+++ debian/changelog 2011-04-15 07:41:11 +0000
4@@ -1,3 +1,10 @@
5+flash-kernel (2.28ubuntu19) natty; urgency=low
6+
7+ * IMX: Use mx5 as subarch name.
8+ * IMX: Add support for customization /boot/boot.script
9+
10+ -- Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org> Fri, 15 Apr 2011 15:11:40 +0800
11+
12 flash-kernel (2.28ubuntu18) natty; urgency=low
13
14 * match omap4 hardware on "OMAP4 Panda board" as well (LP: #744862)
15
16=== modified file 'flash-kernel'
17--- flash-kernel 2011-03-30 09:55:18 +0000
18+++ flash-kernel 2011-04-15 07:41:11 +0000
19@@ -402,10 +402,12 @@
20 rm -f "$tmp"
21
22 if [ -e /boot/boot.script ];then
23- mv $TMPMOUNT/boot.scr $TMPMOUNT/boot.scr.bak
24+ if [ -e $TMPMOUNT/boot.scr ]; then
25+ mv $TMPMOUNT/boot.scr $TMPMOUNT/boot.scr.bak
26+ fi
27 printf "Generating u-boot configuration from /boot/boot.script... " >&2
28 mkimage -A arm -T script -C none -n "Ubuntu boot script" -d /boot/boot.script \
29- /boot/boot.scr >&2 1>/dev/null
30+ $TMPMOUNT/boot.scr >&2 1>/dev/null
31 echo "done." >&2
32 fi
33
34@@ -628,20 +630,20 @@
35 ;;
36 "Freescale MX51 Babbage Board")
37 case $subarch in
38- "imx5"|"mx51")
39+ "mx5"|"mx51")
40 :
41 ;;
42 *)
43 # Not actually the real expected kfile
44 # subarch, but will raise a sensible error
45- check_subarch "imx5 or mx51"
46+ check_subarch "mx5 or mx51"
47 ;;
48 esac
49 IMX_KERNEL_ADDR=0x90008000
50 imx_flash_kernel
51 ;;
52 "Freescale MX53 LOCO Board")
53- check_subarch "imx5"
54+ check_subarch "mx5"
55 IMX_KERNEL_ADDR=0x70008000
56 imx_flash_kernel
57 ;;

Subscribers

People subscribed via source and target branches

to all changes: