diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2012-12-15 12:02:11 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-15 08:57:09 +0900 |
| commit | 8098df15c26b2bf16924df5a134d1a649692ab62 (patch) | |
| tree | fd33523e58940f0c9b3cb6b6d4928dcbddf257f4 /arch/arm/boot | |
| parent | f90755d07d0baa38433d7568ccf13b0b20e154d2 (diff) | |
ARM: mach-shmobile: kzm9d: update defconfig
* Do not disable SUSPEND
Suspend seems to work fine on the kzm9d.
This is part of an effort reduce differences between mach-shmobile
defconfigs with a view to using a common defconfig.
* Enable PM_RUNTIME
This also seems to work fine on the kzm9d.
This is part of an effort reduce differences between mach-shmobile
defconfigs with a view to using a common defconfig.
* Move kernel command line from defconfig to dts.
This brings us one small step closer to sharing defconfig
between kzm9d and other boards.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/emev2-kzm9d.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts index 297e3baba71c..b9b3241f173b 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"; + bootargs = "console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"; }; }; |