summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler <tyler.baker@linaro.org>2014-09-25 18:08:15 (GMT)
committerTyler <tyler.baker@linaro.org>2014-09-25 18:08:15 (GMT)
commit3aed9d59c8f4e1468a27a42e2cc6db33efa980e5 (patch)
tree7ea934e22a088be8d94f5ed806fbc45235f85790
parentc660d3c57948f91f6bdf108a70cd9ea1a7bef4fb (diff)
downloadlava-dispatcher-3aed9d59c8f4e1468a27a42e2cc6db33efa980e5.tar.gz
lava-dispatcher-3aed9d59c8f4e1468a27a42e2cc6db33efa980e5.tar.xz
nfs: update all configs to use tcp, hard, intr options by default
Change-Id: Iab1019017bbbbe286a3fe70452a82972087f61ca
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/amarillo.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/arndale-octa.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/b2120stxh407.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/cubieboard3.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/d01.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/imx6q-wandboard.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/keystone.conf15
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/mustang.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/panda-es.conf3
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf3
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf20
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf20
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf2
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/stx7108.conf2
19 files changed, 53 insertions, 36 deletions
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/amarillo.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/amarillo.conf
index 61b0fa8..0c695f9 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/amarillo.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/amarillo.conf
@@ -14,7 +14,7 @@ boot_cmds_nfs =
setenv autoload no,
setenv fdt_high "'0xffffffff'",
setenv loadkernel "'tftp ${addr_kern} {KERNEL}'",
- setenv nfsargs "'setenv bootargs root=/dev/nfs rw nfsroot={SERVER_IP}:${NFSROOTFS} console=ttyAMA0 ip=dhcp'",
+ setenv nfsargs "'setenv bootargs root=/dev/nfs rw nfsroot={SERVER_IP}:${NFSROOTFS},tcp,hard,intr console=ttyAMA0 ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run nfsargs; bootm 4000000'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale-octa.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale-octa.conf
index 1a0d777..c7fd2c3 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale-octa.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale-octa.conf
@@ -69,7 +69,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=tty0 console=ttySAC3,115200n8 mac=%(mac)s root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=tty0 console=ttySAC3,115200n8 mac=%(mac)s root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf
index 19093a7..a355a7c 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf
@@ -69,7 +69,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttySAC2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} earlyprintk ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=ttySAC2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr earlyprintk ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/b2120stxh407.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/b2120stxh407.conf
index 36ca69e..3831b51 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/b2120stxh407.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/b2120stxh407.conf
@@ -15,4 +15,4 @@ connection_command = telnet %(jtag_stmc_ip)s 5331
boot_cmds_ramdisk = "console=ttyAS0,115200 CONSOLE=/dev/ttyAS0"
-boot_cmds_nfs = "'console=ttyAS0,115200 earlyprintk ip=dhcp root=/dev/nfs nfsroot={SERVER_IP}:{NFSROOTFS},tcp,nfsvers=3'"
+boot_cmds_nfs = "'console=ttyAS0,115200 earlyprintk ip=dhcp root=/dev/nfs nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr,nfsvers=3'"
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf
index 9629bf3..6454329 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/beagle-xm.conf
@@ -51,7 +51,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttyO2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=ttyO2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp'",
setenv bootcmd "'usb start; dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf
index b8282d6..5836e1d 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone-black.conf
@@ -38,7 +38,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttyO0,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=ttyO0,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf
index b8282d6..5836e1d 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/beaglebone.conf
@@ -38,7 +38,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttyO0,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=ttyO0,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/cubieboard3.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/cubieboard3.conf
index d24f2f6..666d2e8 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/cubieboard3.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/cubieboard3.conf
@@ -26,7 +26,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttyS0,115200 debug root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=ttyS0,115200 debug root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/d01.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/d01.conf
index 5b2bbde..9df7aa5 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/d01.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/d01.conf
@@ -110,7 +110,7 @@ boot_cmds_nfs = sendline b,
expect initrd2_tag.start,
sendline 3800040,
expect cmdline_tag.cmdline,
- sendline 'console=ttyS0,115200 root=/dev/nfs root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp',
+ sendline 'console=ttyS0,115200 root=/dev/nfs root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp',
expect D01,
sendline setlinuxatag,
expect D01,
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/imx6q-wandboard.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/imx6q-wandboard.conf
index 30b24d1..dca7948 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/imx6q-wandboard.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/imx6q-wandboard.conf
@@ -24,7 +24,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttymxc0,115200 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=ttymxc0,115200 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/keystone.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/keystone.conf
index 4c825fb..92672f8 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/keystone.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/keystone.conf
@@ -22,6 +22,21 @@ boot_cmds_ramdisk =
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run loadbootmon; run run_mon; run run_kern'",
boot
+boot_cmds_nfs =
+ setenv eth1addr %(eth1addr)s,
+ setenv fdt_high "'0xffffffff'",
+ setenv addr_kern "'0x88000000'",
+ setenv addr_fdt "'0x87000000'",
+ setenv addr_mon "'0xc5f0000'",
+ setenv autoload no,
+ setenv loadkernel "'tftp ${addr_kern} {KERNEL}'",
+ setenv loadfdt "'tftp ${addr_fdt} {DTB}'",
+ setenv loadbootmon "'tftp ${addr_mon} {FIRMWARE}'",
+ setenv nfsargs "'setenv bootargs root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr console=ttyS0,115200n8 ip=dhcp'",
+ setenv usb_ethernet "'usb start; setenv ethact asx0'",
+ setenv bootcmd "'run usb_ethernet; dhcp; setenv serverip {SERVER_IP}; run loadkernel; run nfsargs; run loadfdt; run loadbootmon; run run_mon; run run_kern'",
+ boot
+
boot_options =
boot_cmds
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/mustang.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/mustang.conf
index 9f17754..3bf3e19 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/mustang.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/mustang.conf
@@ -21,7 +21,7 @@ boot_cmds_nfs =
setenv loadkernel "'tftp ${kernel_addr_r} {KERNEL}'",
setenv loadinitrd "'tftp ${initrd_addr_r} {RAMDISK}'",
setenv loadfdt "'tftp ${fdt_addr_r} {DTB}'",
- setenv nfsargs "'setenv bootargs root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} panic=1 console=ttyS0,115200 earlyprintk=uart8250-32bit,0x1c020000 debug ip=dhcp'",
+ setenv nfsargs "'setenv bootargs root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr panic=1 console=ttyS0,115200 earlyprintk=uart8250-32bit,0x1c020000 debug ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/panda-es.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/panda-es.conf
index 4c8668c..4b4ebc9 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/panda-es.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/panda-es.conf
@@ -30,6 +30,7 @@ boot_cmds = mmc init,
root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache
vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000'",
boot
+
boot_cmds_android = mmc init,
mmc part 0,
setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage;
@@ -67,7 +68,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttyO2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp fixrtc nocompcache vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000 init=init'",
+ setenv nfsargs "'setenv bootargs console=ttyO2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp fixrtc nocompcache vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000 init=init'",
setenv bootcmd "'usb start; dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf
index 4c8668c..4b4ebc9 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf
@@ -30,6 +30,7 @@ boot_cmds = mmc init,
root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache
vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000'",
boot
+
boot_cmds_android = mmc init,
mmc part 0,
setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage;
@@ -67,7 +68,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=ttyO2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp fixrtc nocompcache vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000 init=init'",
+ setenv nfsargs "'setenv bootargs console=ttyO2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp fixrtc nocompcache vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000 init=init'",
setenv bootcmd "'usb start; dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf
index 7b3ce78..c525c67 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf
@@ -81,16 +81,16 @@ simulator_boot_wrapper = -a coretile.cluster0.*={AXF}
simulator_command = sudo -u lavaserver ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s
boot_options =
- motherboard.mmc.p_mmc_file
- motherboard.hostbridge.userNetPorts
- motherboard.smsc_91c111.enabled
- motherboard.hostbridge.userNetworking
- motherboard.flashloader0.fname
- motherboard.flashloader1.fname
- motherboard.flashloader1.fnameWrite
- coretile.cache_state_modelled
- coretile.cluster0.cpu0.semihosting-enable
- coretile.cluster0.cpu0.semihosting-cmd_line
+ motherboard.mmc.p_mmc_file
+ motherboard.hostbridge.userNetPorts
+ motherboard.smsc_91c111.enabled
+ motherboard.hostbridge.userNetworking
+ motherboard.flashloader0.fname
+ motherboard.flashloader1.fname
+ motherboard.flashloader1.fnameWrite
+ coretile.cache_state_modelled
+ coretile.cluster0.cpu0.semihosting-enable
+ coretile.cluster0.cpu0.semihosting-cmd_line
[motherboard.mmc.p_mmc_file]
default = {IMG}
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf
index a3ec9ab..29e00cb 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf
@@ -81,16 +81,16 @@ simulator_boot_wrapper = -a coretile.cluster0.*={AXF}
simulator_command = sudo -u lavaserver ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s
boot_options =
- motherboard.mmc.p_mmc_file
- motherboard.hostbridge.userNetPorts
- motherboard.smsc_91c111.enabled
- motherboard.hostbridge.userNetworking
- motherboard.flashloader0.fname
- motherboard.flashloader1.fname
- motherboard.flashloader1.fnameWrite
- coretile.cache_state_modelled
- coretile.cluster0.cpu0.semihosting-enable
- coretile.cluster0.cpu0.semihosting-cmd_line
+ motherboard.mmc.p_mmc_file
+ motherboard.hostbridge.userNetPorts
+ motherboard.smsc_91c111.enabled
+ motherboard.hostbridge.userNetworking
+ motherboard.flashloader0.fname
+ motherboard.flashloader1.fname
+ motherboard.flashloader1.fnameWrite
+ coretile.cache_state_modelled
+ coretile.cluster0.cpu0.semihosting-enable
+ coretile.cluster0.cpu0.semihosting-cmd_line
[motherboard.mmc.p_mmc_file]
default = {IMG}
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf
index ea506e5..cd160b4 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf
@@ -61,7 +61,7 @@ simulator_boot_wrapper = -a {AXF}
simulator_command = sudo -u lavaserver ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s %(sim_model)s
boot_options =
- motherboard.mmc.p_mmc_file
+ motherboard.mmc.p_mmc_file
motherboard.smsc_91c111.enabled
cluster.NUM_CORES
cluster.cpu0.unpredictable_WPMASKANDBAS
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf
index 7cd0a67..87894f4 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf
@@ -57,7 +57,7 @@ boot_cmds_nfs =
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 nfsargs "'setenv bootargs console=tty0 console=ttyAMA2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} fixrtc nocompcache vmalloc=300M mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M ip=dhcp'",
+ setenv nfsargs "'setenv bootargs console=tty0 console=ttyAMA2,115200n8 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr fixrtc nocompcache vmalloc=300M mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M ip=dhcp'",
setenv bootcmd "'dhcp; setenv serverip {SERVER_IP}; run loadkernel; run loadinitrd; run loadfdt; run nfsargs; {BOOTX}'",
boot
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/stx7108.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/stx7108.conf
index c352280..fe7eb6f 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/stx7108.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/stx7108.conf
@@ -13,4 +13,4 @@ connection_command = telnet %(jtag_stmc_ip)s 5331
stx7108_mac = 00:00:00:00:00:00
-boot_cmds_nfs = "'console=ttyAS1,115200 root=/dev/nfs nfsroot={SERVER_IP}:{NFSROOTFS},nfsvers=3,rsize=4096,wsize=8192,tcp nwhwconf=device:eth0,hwaddr:%(stx7108_mac)s ip=dhcp bpa2parts=bigphysarea:64M::,modules:2M::'"
+boot_cmds_nfs = "'console=ttyAS1,115200 root=/dev/nfs nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr,nfsvers=3,rsize=4096,wsize=8192 nwhwconf=device:eth0,hwaddr:%(stx7108_mac)s ip=dhcp bpa2parts=bigphysarea:64M::,modules:2M::'"