Linaro Image Tools

Merge lp:~salgado/linaro-image-tools/trivial into lp:linaro-image-tools/11.11

  1. trivial
  2. Merge into trunk
Proposed by Guilherme Salgado
Status: Merged
Merged at revision: 229
Proposed branch: lp:~salgado/linaro-image-tools/trivial
Merge into: lp:linaro-image-tools/11.11
Diff against target: 48 lines (+5/-12)
1 file modified
linaro-media-create (+5/-12)
To merge this branch: bzr merge lp:~salgado/linaro-image-tools/trivial
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+45128@code.launchpad.net

Description of the change

Move some remaining board-specific configs to the one block where they should
all be defined

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
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 2011-01-04 12:08:13 +0000
3+++ linaro-media-create 2011-01-04 14:36:18 +0000
4@@ -266,18 +266,6 @@
5 ;;
6 esac
7
8-case "$DEVIMAGE" in
9- beagle)
10- UBOOT_FLAVOR="omap3_beagle"
11- ;;
12- panda)
13- UBOOT_FLAVOR="omap4_panda"
14- ;;
15- vexpress)
16- UBOOT_FLAVOR="ca9x4_ct_vxp"
17- ;;
18-esac
19-
20 RFS_UUID=`uuidgen -r`
21
22 install_hwpacks () {
23@@ -526,6 +514,9 @@
24 if [ "$DEVIMAGE" ]; then
25 case "$DEVIMAGE" in
26 beagle|igep)
27+ if [ "$DEVIMAGE" == "beagle" ]; then
28+ UBOOT_FLAVOR="omap3_beagle"
29+ fi
30 serial_opts="$serial_opts console=tty0 console=ttyS2,115200n8"
31 if [ "$IS_LIVE" -eq 1 ]; then
32 serial_opts="$serial_opts serialtty=ttyS2"
33@@ -538,6 +529,7 @@
34 boot_args_options="$boot_args_options earlyprintk fixrtc nocompcache vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60"
35 ;;
36 panda)
37+ UBOOT_FLAVOR="omap4_panda"
38 serial_opts="$serial_opts console=tty0 console=ttyO2,115200n8"
39 if [ "$IS_LIVE" -eq 1 ]; then
40 serial_opts="$serial_opts serialtty=ttyO2"
41@@ -577,6 +569,7 @@
42 mmc_option="0:2"
43 ;;
44 vexpress)
45+ UBOOT_FLAVOR="ca9x4_ct_vxp"
46 serial_opts="$serial_opts console=tty0 console=ttyAMA0,38400n8"
47 if [ "$IS_LIVE" -eq 1 ]; then
48 serial_opts="$serial_opts serialtty=ttyAMA0"

Subscribers

People subscribed via source and target branches