Merge lp:~lnxtorez/linaro-image-tools/igep-support into lp:linaro-image-tools/11.11

Proposed by Torez Smith
Status: Merged
Merged at revision: 57
Proposed branch: lp:~lnxtorez/linaro-image-tools/igep-support
Merge into: lp:linaro-image-tools/11.11
Diff against target: 46 lines (+9/-6)
1 file modified
linaro-media-create (+9/-6)
To merge this branch: bzr merge lp:~lnxtorez/linaro-image-tools/igep-support
Reviewer Review Type Date Requested Status
Loïc Minier (community) Approve
Review via email: mp+34626@code.launchpad.net

Description of the change

Added board support for OMAP IGEP board

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

The two commits with similar messages are a bit weird; note that the == test is a bashishm, best to use "=" for shell string tests.

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

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-09-01 12:34:06 +0000
3+++ linaro-media-create 2010-09-04 20:39:40 +0000
4@@ -197,10 +197,12 @@
5 mkdir -p ${DIR}/disk || true
6 sudo mount ${MMC1} ${DIR}/disk
7 case "$DEVIMAGE" in
8- beagle)
9- if test -e binary/${parts_dir}/${MLO_FILE} -a -e binary/${parts_dir}/${UBOOT_FILE}; then
10- sudo cp -v binary/${parts_dir}/${MLO_FILE} ${DIR}/disk/MLO
11- sudo cp -v binary/${parts_dir}/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
12+ beagle|igep)
13+ if [ "$DEVIMAGE" == "beagle" ]; then
14+ if test -e binary/${parts_dir}/${MLO_FILE} -a -e binary/${parts_dir}/${UBOOT_FILE}; then
15+ sudo cp -v binary/${parts_dir}/${MLO_FILE} ${DIR}/disk/MLO
16+ sudo cp -v binary/${parts_dir}/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
17+ fi
18 fi
19 sync
20 cd ${DIR}
21@@ -222,7 +224,7 @@
22 "${DIR}"/disk/uInitrd
23 ;;
24 *)
25- echo "Set --dev parameter: --dev <beagle|vexpress>" 1>&2
26+ echo "Set --dev parameter: --dev <beagle|igep|vexpress>" 1>&2
27 cleanup_workdir
28 exit
29 ;;
30@@ -386,6 +388,7 @@
31 use development boot options; this includes setting up serial ttys as well
32 as enabling normal debug options for the target board. Current board values:
33 * beagle
34+ * igep
35 * vexpress
36
37 Additional/Optional options:
38@@ -523,7 +526,7 @@
39
40 if [ "$DEVIMAGE" ]; then
41 case "$DEVIMAGE" in
42- beagle)
43+ beagle|igep)
44 serial_opts="$serial_opts console=tty0 console=ttyS2,115200n8"
45 if [ "$IS_LIVE" ]; then
46 serial_opts="$serial_opts serialtty=ttyS2"

Subscribers

People subscribed via source and target branches