summaryrefslogtreecommitdiff
path: root/multi-node-job
diff options
context:
space:
mode:
authorTyler Baker <tyler.baker@linaro.org>2014-02-24 09:42:57 -0800
committerTyler Baker <tyler.baker@linaro.org>2014-02-24 09:42:57 -0800
commited28ef71f2d433f48efd72308ca8466b908aab60 (patch)
treead3af36639d4a68d276bbf625bea43c4600503de /multi-node-job
parent31454ff48bbecd15d8a61c6ce1fd06a104a7a5d3 (diff)
bootloader: update functional test for changes in tip
Change-Id: I5d1c4cb8477ffb1ac2f7d1de3af32975c5e8b110
Diffstat (limited to 'multi-node-job')
-rw-r--r--multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json8
1 files changed, 4 insertions, 4 deletions
diff --git a/multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json b/multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json
index 3e85f46..9ab2345 100644
--- a/multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json
+++ b/multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json
@@ -39,11 +39,11 @@
"setenv fdt_addr_r '0x815f0000'",
"setenv initrd_high '0xffffffff'",
"setenv fdt_high '0xffffffff'",
- "setenv loadkernel 'tftp ${kernel_addr_r} ${lava_kernel}'",
- "setenv loadinitrd 'tftp ${initrd_addr_r} ${lava_ramdisk}; setenv initrd_size ${filesize}'",
- "setenv loadfdt 'tftp ${fdt_addr_r} ${lava_dtb}'",
+ "setenv loadkernel 'tftp ${kernel_addr_r} {KERNEL}'",
+ "setenv loadinitrd 'tftp ${initrd_addr_r} {RAMDISK}; setenv initrd_size ${filesize}'",
+ "setenv loadfdt 'tftp ${fdt_addr_r} {DTB}'",
"setenv bootargs 'console=ttyO0,115200n8 root=/dev/ram0 ip=:::::eth0:dhcp'",
- "setenv bootcmd 'dhcp; setenv serverip ${lava_server_ip}; run loadkernel; run loadinitrd; run loadfdt; bootz ${kernel_addr_r} ${initrd_addr_r} ${fdt_addr_r}'",
+ "setenv bootcmd 'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; bootz ${kernel_addr_r} ${initrd_addr_r} ${fdt_addr_r}'",
"boot"]
}
},