summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2012-12-15 12:02:11 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-01-15 08:57:09 +0900
commitf90755d07d0baa38433d7568ccf13b0b20e154d2 (patch)
tree73a083537fe54c17763c81d5b598095d00edc60f /arch/arm/boot/dts
parentbe919006552ad985c83f1b3b3c1e931894be6c2f (diff)
downloadlwn-f90755d07d0baa38433d7568ccf13b0b20e154d2.tar.gz
lwn-f90755d07d0baa38433d7568ccf13b0b20e154d2.zip
ARM: mach-shmobile: armadillo: update defconfig
* Enable ARM_APPENDED_DTB Typically the bootloader of an armadillo board does not support DT so this option is useful. * Do not disable SUSPEND Suspend seems to work fine on the armadillo * Enable PM_RUNTIME This also seems to work fine. * Move command line to dts This brings us one small step closer to sharing defconfig between armadillo and other boards Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/r8a7740-armadillo800eva.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index a7505a95a3b7..52cfeadd2cdd 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -15,6 +15,10 @@
model = "armadillo 800 eva";
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";
+ };
+
memory {
device_type = "memory";
reg = <0x40000000 0x20000000>;