| From d6c4beb3c6ff439199a643bd173f2f1bd1175ef2 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Mon, 5 Aug 2013 20:17:33 -0700 |
| Subject: ARM: shmobile: kzm9d: 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 6de69131854501dcc9585d44087430584f8ccdf4) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/emev2-kzm9d-reference.dts | 2 +- |
| arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/emev2-kzm9d-reference.dts b/arch/arm/boot/dts/emev2-kzm9d-reference.dts |
| index bed676b9..cceefda2 100644 |
| --- a/arch/arm/boot/dts/emev2-kzm9d-reference.dts |
| +++ b/arch/arm/boot/dts/emev2-kzm9d-reference.dts |
| @@ -21,7 +21,7 @@ |
| }; |
| |
| chosen { |
| - bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"; |
| + bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp"; |
| }; |
| |
| reg_1p8v: regulator@0 { |
| diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts |
| index dda13bc0..f92e812f 100644 |
| --- a/arch/arm/boot/dts/emev2-kzm9d.dts |
| +++ b/arch/arm/boot/dts/emev2-kzm9d.dts |
| @@ -21,6 +21,6 @@ |
| }; |
| |
| chosen { |
| - bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"; |
| + bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp"; |
| }; |
| }; |
| -- |
| 1.8.4.3.gca3854a |
| |
