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
=== added file 'boards.d/vexpresstc2.conf'
--- boards.d/vexpresstc2.conf 1970-01-01 00:00:00 +0000
+++ boards.d/vexpresstc2.conf 2012-09-26 07:31:38 +0000
@@ -0,0 +1,22 @@
1# vim: syntax=sh
2DESC="ARM Versatile Express - TC2"
3# Root File System
4ROOTFS=linaro-precise-nano-20120626-237.tar.gz
5ROOTFS_URL=http://releases.linaro.org/12.06/ubuntu/precise-images/nano/$ROOTFS
6ROOTFS_MD5=8ee72bc38e4739a6720c5bba678d8ed0
7# Root filesystem partition number as created by linaro-media-create
8ROOTFS_PARTITION=2
9# Hardware Pack
10HWPACK=hwpack_linaro-vexpress_20120627-132_armhf_supported.tar.gz
11HWPACK_URL=http://releases.linaro.org/12.06/ubuntu/vexpress/$HWPACK
12HWPACK_MD5=7376ab405e6dff952ed754b968c238fc
13# Device name for linaro-media-create
14LMC_DEV=vexpress-a9
15# Device name for LAVA
16LAVA_DEV=lava:vexpresstc2
17# When LICENSE_WRAP is not empty then a custom download handler is required to
18# evade the license wrapper. In such cases a dedicated download function must
19# be defined in this file. The function has to be called
20# ${board}_download_and_md5() where ${board} is the name of this file without
21# the .conf suffix.
22LICENSE_WRAP=
023
=== modified file 'master-rootfs-extras/bin/lava-partition-disk'
--- master-rootfs-extras/bin/lava-partition-disk 2012-06-29 06:56:26 +0000
+++ master-rootfs-extras/bin/lava-partition-disk 2012-09-26 07:31:38 +0000
@@ -93,8 +93,13 @@
93 SCHEME=2part93 SCHEME=2part
94 DEVICE="/dev/mmcblk0"94 DEVICE="/dev/mmcblk0"
95 ;;95 ;;
96 lava:vexpresstc2)
97 PRE_ENV=N
98 SCHEME=2part
99 DEVICE="/dev/mmcblk0"
100 ;;
96 *)101 *)
97 echo "Board type \"$1\" not supported"102 echo "Board type \"$DEVICE_TYPE\" not supported"
98 exit 1103 exit 1
99 ;;104 ;;
100 esac105 esac

Subscribers

People subscribed via source and target branches