diff options
| author | Tyler Baker <tyler.baker@linaro.org> | 2013-11-07 11:07:05 -0800 |
|---|---|---|
| committer | Tyler Baker <tyler.baker@linaro.org> | 2013-11-07 11:07:05 -0800 |
| commit | e9b256502ec6fac4d406078e19547d1852fd47a9 (patch) | |
| tree | e9590102ac20b6d2dc1f11afb1293db7a95e2e8b /multi-node-job | |
| parent | 8245ca9907f4a70cb9b8237df5458cfd28d796fc (diff) | |
Update functional test to reflect changes to interactive boot commands.
Signed-off-by: Tyler Baker <tyler.baker@linaro.org>
Diffstat (limited to 'multi-node-job')
| -rw-r--r-- | multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json | 27 |
1 files changed, 13 insertions, 14 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 6decf17..8e345ca 100644 --- a/multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json +++ b/multi-node-job/bootloader/bootloader-lava-test-shell-multinode.json @@ -32,20 +32,19 @@ { "command": "boot_linaro_image", "parameters": { - "interactive_boot_cmds": true, - "options": ["setenv autoload no", - "setenv pxefile_addr_r '0x50000000'", - "setenv kernel_addr_r '0x80200000'", - "setenv initrd_addr_r '0x81000000'", - "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 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}'", - "boot"] + "boot_cmds": ["setenv autoload no", + "setenv pxefile_addr_r '0x50000000'", + "setenv kernel_addr_r '0x80200000'", + "setenv initrd_addr_r '0x81000000'", + "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 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}'", + "boot"] } }, { |