diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2014-10-10 12:42:09 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2014-10-10 12:42:09 +0100 |
| commit | e110c0f17a5c518bf6d0934d0aaf816a9b36a764 (patch) | |
| tree | 9f1f09427c609b312fa88515334a271c2ac17403 | |
| parent | e04a740f006859405cb8e39f743ec0d4425f7766 (diff) | |
examples: various mustang tweaks
mustang-hacking-session now uses a semi-perm nfs partition
| -rw-r--r-- | examples/mustang-cloudimg-continue.json | 2 | ||||
| -rw-r--r-- | examples/mustang-cloudimg-hacking-session.json | 17 | ||||
| -rw-r--r-- | examples/mustang-hacking-session.json | 11 |
3 files changed, 13 insertions, 17 deletions
diff --git a/examples/mustang-cloudimg-continue.json b/examples/mustang-cloudimg-continue.json index b3dafba..e1d536d 100644 --- a/examples/mustang-cloudimg-continue.json +++ b/examples/mustang-cloudimg-continue.json @@ -27,7 +27,7 @@ "setenv initrd_addr_r '{RAMDISK_ADDR}'", "setenv fdt_addr_r '{DTB_ADDR}'", "setenv loadstuff 'tftp ${kernel_addr_r} {KERNEL}; tftp ${initrd_addr_r} {RAMDISK}; tftp ${fdt_addr_r} {DTB}'", - "setenv bootargs console=ttyS0,115200 root=/dev/sda1 ip=dhcp", + "setenv bootargs console=ttyS0,115200 root=/dev/sda1 ip=dhcp norandmaps", "setenv bootcmd 'dhcp; setenv serverip {SERVER_IP}; run loadstuff; {BOOTX}'", "boot" ] diff --git a/examples/mustang-cloudimg-hacking-session.json b/examples/mustang-cloudimg-hacking-session.json index b3051e5..4aa0d22 100644 --- a/examples/mustang-cloudimg-hacking-session.json +++ b/examples/mustang-cloudimg-hacking-session.json @@ -6,16 +6,16 @@ { "command": "deploy_linaro_kernel", "parameters": { - "dtb": "http://lava-leg02/~mwhudson/mustang.dtb", - "kernel": "http://lava-leg02/~mwhudson/uImage", + "kernel": "http://people.linaro.org/~mwhudson/mustang-deploy/uImage", + "dtb": "http://people.linaro.org/~mwhudson/mustang-deploy/mustang.dtb", + "ramdisk": "http://people.linaro.org/~mwhudson/mustang-deploy/uInitrd-nfs", + "nfsrootfs": "http://people.linaro.org/~mwhudson/mustang-deploy/ubuntu-arm64-chroot.tar.bz2", "login_commands": [ "sudo su -l" ], "login_prompt": "login:", - "nfsrootfs": "http://people.linaro.org/~alex.bennee/images/mustang/ubuntu-arm64-chroot.tar.xz", "password": "ubuntu", "password_prompt": "Password", - "ramdisk": "http://lava-leg02/~mwhudson/uInitrd-nfs", "target_type": "ubuntu", "username": "ubuntu" } @@ -86,12 +86,17 @@ { "git-repo": "http://git.linaro.org/people/alex.bennee/test-definitions.git", "revision": "qemu-testing", - "testdef": "ubuntu/devel-bootstrap.yaml" + "testdef": "ubuntu/devel-bootstrap.yaml", + "parameters": { + "BUILD_DEPS": "qemu", + "EXTRA_PKGS": "language-pack-en-base nfs-common gdb htop iotop expect", + "EXTRA_FILES": "http://people.linaro.org/~alex.bennee/images/aarch64-linux-3.16-buildroot-gdb.img http://people.linaro.org/~alex.bennee/images/aarch64-linux-3.16-buildroot-gdb.vmlinux" + } }, { "git-repo": "http://git.linaro.org/people/alex.bennee/hacking-session.git", "parameters": { - "GATEWAY": "10.0.0.1", + "IRC_USER": "ajb-linaro", "PUB_KEY": `(format "\"%s\"" (s-trim (shell-command-to-string "cat ~/.ssh/id_rsa.pub")))` }, "testdef": "hacking-session-debian.yaml" diff --git a/examples/mustang-hacking-session.json b/examples/mustang-hacking-session.json index 3c8ea51..bffcbf4 100644 --- a/examples/mustang-hacking-session.json +++ b/examples/mustang-hacking-session.json @@ -20,7 +20,7 @@ "setenv fdt_addr_r '0x4003000000'", "setenv loadkernel 'tftp ${kernel_addr_r} {KERNEL}'", "setenv loadfdt 'tftp ${fdt_addr_r} {DTB}'", - "setenv bootargs 'setenv bootargs root=/dev/nfs rw nfsroot=10.2.3.1:/var/lib/lava/dispatcher/tmp/ajb,tcp,hard,intr panic=1 console=ttyS0,115200 earlycon=uart8250-32bit,0x1c020000 earlyprintk=uart8250-32bit,0x1c020000 debug ip=dhcp'", + "setenv bootargs 'root=/dev/nfs rw nfsroot=10.0.0.10:/nfs/ajb/ubuntu-trusty.arm64,tcp,hard,intr panic=1 console=ttyS0,115200 ip=dhcp'", "setenv bootcmd 'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadfdt; bootm ${kernel_addr_r} - ${fdt_addr_r}'", "boot" ] @@ -31,15 +31,6 @@ "parameters": { "testdef_repos": [ { - "git-repo": "http://git.linaro.org/people/alex.bennee/test-definitions.git", - "revision": "qemu-testing", - "testdef": "ubuntu/devel-bootstrap.yaml", - "parameters": { - "BUILD_DEPS": "qemu", - "EXTRA_PKGS": "language-pack-en-base gdb htop iotop" - } - }, - { "git-repo": "http://git.linaro.org/people/alex.bennee/hacking-session.git", "parameters": { "IRC_USER": "ajb-linaro", |