Merge lp:~dpigott/lava-master-image-scripts/add-vc2-support-again into lp:lava-master-image-scripts

Proposed by Dave Pigott
Status: Merged
Merged at revision: 68
Proposed branch: lp:~dpigott/lava-master-image-scripts/add-vc2-support-again
Merge into: lp:lava-master-image-scripts
Diff against target: 45 lines (+28/-1)
2 files modified
boards.d/vexpresstc2.conf (+22/-0)
master-rootfs-extras/bin/lava-partition-disk (+6/-1)
To merge this branch: bzr merge lp:~dpigott/lava-master-image-scripts/add-vc2-support-again
Reviewer Review Type Date Requested Status
Dave Pigott Approve
Review via email: mp+126400@code.launchpad.net

Description of the change

Add tc2 support again - I mucked up my merge and thought it safer to do it this way

To post a comment you must log in.
Revision history for this message
Dave Pigott (dpigott) wrote :

Self approve since it's the same code that was approved previously

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'boards.d/vexpresstc2.conf'
2--- boards.d/vexpresstc2.conf 1970-01-01 00:00:00 +0000
3+++ boards.d/vexpresstc2.conf 2012-09-26 07:31:38 +0000
4@@ -0,0 +1,22 @@
5+# vim: syntax=sh
6+DESC="ARM Versatile Express - TC2"
7+# Root File System
8+ROOTFS=linaro-precise-nano-20120626-237.tar.gz
9+ROOTFS_URL=http://releases.linaro.org/12.06/ubuntu/precise-images/nano/$ROOTFS
10+ROOTFS_MD5=8ee72bc38e4739a6720c5bba678d8ed0
11+# Root filesystem partition number as created by linaro-media-create
12+ROOTFS_PARTITION=2
13+# Hardware Pack
14+HWPACK=hwpack_linaro-vexpress_20120627-132_armhf_supported.tar.gz
15+HWPACK_URL=http://releases.linaro.org/12.06/ubuntu/vexpress/$HWPACK
16+HWPACK_MD5=7376ab405e6dff952ed754b968c238fc
17+# Device name for linaro-media-create
18+LMC_DEV=vexpress-a9
19+# Device name for LAVA
20+LAVA_DEV=lava:vexpresstc2
21+# When LICENSE_WRAP is not empty then a custom download handler is required to
22+# evade the license wrapper. In such cases a dedicated download function must
23+# be defined in this file. The function has to be called
24+# ${board}_download_and_md5() where ${board} is the name of this file without
25+# the .conf suffix.
26+LICENSE_WRAP=
27
28=== modified file 'master-rootfs-extras/bin/lava-partition-disk'
29--- master-rootfs-extras/bin/lava-partition-disk 2012-06-29 06:56:26 +0000
30+++ master-rootfs-extras/bin/lava-partition-disk 2012-09-26 07:31:38 +0000
31@@ -93,8 +93,13 @@
32 SCHEME=2part
33 DEVICE="/dev/mmcblk0"
34 ;;
35+ lava:vexpresstc2)
36+ PRE_ENV=N
37+ SCHEME=2part
38+ DEVICE="/dev/mmcblk0"
39+ ;;
40 *)
41- echo "Board type \"$1\" not supported"
42+ echo "Board type \"$DEVICE_TYPE\" not supported"
43 exit 1
44 ;;
45 esac

Subscribers

People subscribed via source and target branches