diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2016-08-09 10:46:57 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-09-29 06:03:24 +0200 |
| commit | 4ce5f79a237fbdb995d560b291bd05c824764a2e (patch) | |
| tree | 5b8f41de37f9b271211298c1ce72e14750a1df0e | |
| parent | d6f3535c5ca41836297d55dd6f5342a53d900014 (diff) | |
default environment: remove netdevwait from nfs boot args
netdevwait was used in the 2.6.36 based Vibrante kernel for
Colibri T20.
None of our kernel trees evaluate that cmdline parameter.
So drop it from the nfsargs environment variable.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | include/configs/apalis-tk1.h | 2 | ||||
| -rw-r--r-- | include/configs/apalis_imx6.h | 2 | ||||
| -rw-r--r-- | include/configs/apalis_t30.h | 2 | ||||
| -rw-r--r-- | include/configs/colibri_imx6.h | 2 | ||||
| -rw-r--r-- | include/configs/colibri_t20.h | 2 | ||||
| -rw-r--r-- | include/configs/colibri_t30.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index d1f6e9db895..ac59ca7346e 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -117,7 +117,7 @@ "setenv dtbparam ${fdt_addr_r}\0" #define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0:on root=/dev/nfs rw netdevwait\0" \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsboot=run setup; setenv bootargs ${defargs} ${nfsargs} " \ "${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ "run nfsdtbload; dhcp ${kernel_addr_r} " \ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 3ea4a5c38f6..de117198ee2 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -242,7 +242,7 @@ "ramdisk_addr_r=0x12100000\0" #define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0:on root=/dev/nfs rw netdevwait\0" \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsboot=run setup; " \ "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \ "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 600fcb42fa8..64ceb18c884 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -136,7 +136,7 @@ "setenv dtbparam ${fdt_addr_r}\0" #define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0:on root=/dev/nfs rw netdevwait\0" \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsboot=run setup; setenv bootargs ${defargs} ${nfsargs} " \ "${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ "run nfsdtbload; dhcp ${kernel_addr_r} " \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index adc2d1e9c52..0557c187c16 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -213,7 +213,7 @@ "ramdisk_addr_r=0x12100000\0" #define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0:on root=/dev/nfs rw netdevwait\0" \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsboot=run setup; " \ "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \ "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 36c631cfb38..f312c8161a1 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -146,7 +146,7 @@ #define DFU_ALT_NAND_INFO "u-boot part 0,0;ubi part 0,3" #define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0:on root=/dev/nfs rw netdevwait\0" \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsboot=usb start; run setup; setenv bootargs ${defargs} ${mtdparts}" \ " ${nfsargs} ${setupargs} ${vidargs}; echo Booting via DHCP/" \ "TFTP/NFS...; run nfsdtbload; dhcp ${kernel_addr_r} " \ diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 79c7a1a6ec8..9e506026454 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -127,7 +127,7 @@ "setenv dtbparam ${fdt_addr_r}\0" #define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0:on root=/dev/nfs rw netdevwait\0" \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsboot=usb start; run setup; setenv bootargs ${defargs} ${nfsargs} " \ "${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ "run nfsdtbload; dhcp ${kernel_addr_r} " \ |