| From 6649f5c17f0cd975568abf3cc662ce2179c37e23 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 5 Aug 2013 20:17:06 -0700 |
| Subject: ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs |
| |
| NFS detail settings like "nfsroot=,rsize=4096,wsize=4096" are no longer needed |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 3d814499ad80d7876d6d484e4d37fae79cb403c6) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +- |
| arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| index 366f7298..c638e4ab 100644 |
| --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| @@ -17,7 +17,7 @@ |
| compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740"; |
| |
| chosen { |
| - bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw"; |
| + bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw"; |
| }; |
| |
| memory { |
| diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts |
| index 93da655b..426cd9c3 100644 |
| --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts |
| +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts |
| @@ -16,7 +16,7 @@ |
| compatible = "renesas,armadillo800eva"; |
| |
| chosen { |
| - bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw"; |
| + bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw"; |
| }; |
| |
| memory { |
| -- |
| 1.8.4.3.gca3854a |
| |
