Merge lp:~mwaddel/linaro-image-tools/vexpress-additions-v3 into lp:linaro-image-tools/11.11

Proposed by Matt Waddel
Status: Merged
Merged at revision: 30
Proposed branch: lp:~mwaddel/linaro-image-tools/vexpress-additions-v3
Merge into: lp:linaro-image-tools/11.11
Diff against target: 100 lines (+43/-19)
1 file modified
linaro-media-create (+43/-19)
To merge this branch: bzr merge lp:~mwaddel/linaro-image-tools/vexpress-additions-v3
Reviewer Review Type Date Requested Status
Loïc Minier (community) Needs Fixing
Review via email: mp+33446@code.launchpad.net

Description of the change

1) Refactored boot/rootfs creation for adding new platforms.
2) Added the Versatile Express platform.

To post a comment you must log in.
Revision history for this message
Loïc Minier (lool) wrote :

Matt, overall it looked good, there is only one small issue in r31, you have a reference to omap in the vexpress case statement:
    sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd

feel free to fix this in an additional commit on top

You didn't mention whether you tested that, did you manage to create a working image with this?

Thanks!

review: Needs Fixing
Revision history for this message
Matt Waddel (mwaddel) wrote :

The current vexpress doesn't use the uInitrd. So this is a benign problem and doesn't affect the booting vexpress image. I'll fix it when we get a specific uInitrd.vexpress file (if that's ok with you).

Revision history for this message
Loïc Minier (lool) wrote :

Well you should fix it before I merge since we caught that issue in review, but you can comment out this line locally until there's an uInitrd in the daily builds

Revision history for this message
Matt Waddel (mwaddel) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro-media-create'
2--- linaro-media-create 2010-08-05 15:10:31 +0000
3+++ linaro-media-create 2010-08-23 20:22:38 +0000
4@@ -169,7 +169,7 @@
5 echo ""
6
7 echo ""
8- echo "Installing OMAP Boot Loader"
9+ echo "Installing Boot Loader"
10 echo ""
11
12 if [ "$IS_LIVE" ]; then
13@@ -180,19 +180,36 @@
14
15 mkdir -p ${DIR}/disk || true
16 sudo mount ${MMC1} ${DIR}/disk
17- if test -e binary/${parts_dir}/${MLO_FILE} -a -e binary/${parts_dir}/${UBOOT_FILE}; then
18- sudo cp -v binary/${parts_dir}/${MLO_FILE} ${DIR}/disk/MLO
19- sudo cp -v binary/${parts_dir}/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
20- fi
21- sync
22- cd ${DIR}
23- echo "done"
24-
25- sudo cp -f ${DIR}/binary/${parts_dir}/uImage.omap ${DIR}/disk/uImage
26- sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd
27-
28- sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "$CODENAME 10.05" -d ${DIR}/binary/boot.cmd ${DIR}/disk/boot.scr
29- sudo cp -v ${DIR}/disk/boot.scr ${DIR}/disk/boot.ini
30+ case "$DEVIMAGE" in
31+ beagle)
32+ if test -e binary/${parts_dir}/${MLO_FILE} -a -e binary/${parts_dir}/${UBOOT_FILE}; then
33+ sudo cp -v binary/${parts_dir}/${MLO_FILE} ${DIR}/disk/MLO
34+ sudo cp -v binary/${parts_dir}/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
35+ fi
36+ sync
37+ cd ${DIR}
38+ echo "done"
39+
40+ sudo cp -f ${DIR}/binary/${parts_dir}/uImage.omap ${DIR}/disk/uImage
41+ sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd
42+
43+ sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "$CODENAME 10.05" -d ${DIR}/binary/boot.cmd ${DIR}/disk/boot.scr
44+ sudo cp -v ${DIR}/disk/boot.scr ${DIR}/disk/boot.ini
45+ ;;
46+ vexpress)
47+ sudo cp -v ${DIR}/binary/${parts_dir}/u-boot-ca9x4_ct_vxp.bin \
48+ ${DIR}/disk/ubootca9.bin
49+ sudo cp -f ${DIR}/binary/${parts_dir}/vmlinuz*-vexpress ${DIR}/disk/vmlinuz
50+ mkimage -A arm -O linux -T kernel -C none -a 0x60008000 -e 0x60008000 \
51+ -n "Linux" -d ${DIR}/disk/vmlinuz ${DIR}/disk/uImage.vxp
52+ sudo cp -f ${DIR}/binary/${parts_dir}/uInitrd.omap ${DIR}/disk/uInitrd
53+ ;;
54+ *)
55+ echo "Set --dev parameter: --dev <beagle|vexpress>" 1>&2
56+ cleanup_workdir
57+ exit
58+ ;;
59+ esac
60
61 echo "#!/bin/sh" > /tmp/rebuild_uinitrd.sh
62 echo "" >> /tmp/rebuild_uinitrd.sh
63@@ -362,6 +379,12 @@
64 --image_file <xxx>
65 specify name of image file
66
67+--dev <board>
68+ use development boot options; this includes setting up serial ttys as well
69+ as enabling normal debug options for the target board. Current board values:
70+ * beagle
71+ * vexpress
72+
73 Additional/Optional options:
74 -h --help
75 this help
76@@ -390,11 +413,6 @@
77 Create boot command for casper/live images; adds only-ubiquity option
78 to allow use of live installer on boards with 256M memory - like beagle
79
80---dev <board>
81- use development boot options; this includes setting up serial ttys as well
82- as enabling normal debug options for the target board. Current board values:
83- * beagle
84-
85 --console <ttyXY>
86 add a console to kernel boot parameter; this parameter can be defined
87 multiple times.
88@@ -508,6 +526,12 @@
89 serial_opts="$serial_opts serialtty=ttyS2"
90 fi
91 ;;
92+ vexpress)
93+ serial_opts="$serial_opts console=tty0 console=ttyAMA0,38400n8"
94+ if [ "$IS_LIVE" ]; then
95+ serial_opts="$serial_opts serialtty=ttyAMA0"
96+ fi
97+ ;;
98 *)
99 echo "unknown --dev paramater: $DEVIMAGE" 1>&2
100 ;;

Subscribers

People subscribed via source and target branches