aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs/kzm9d_defconfig
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
commit8098df15c26b2bf16924df5a134d1a649692ab62 (patch)
treefd33523e58940f0c9b3cb6b6d4928dcbddf257f4 /arch/arm/configs/kzm9d_defconfig
parentf90755d07d0baa38433d7568ccf13b0b20e154d2 (diff)
downloadlinux-linaro-stable-8098df15c26b2bf16924df5a134d1a649692ab62.tar.gz
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/configs/kzm9d_defconfig')
-rw-r--r--arch/arm/configs/kzm9d_defconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
index 8c49df66cac3..6c37f4a98eb8 100644
--- a/arch/arm/configs/kzm9d_defconfig
+++ b/arch/arm/configs/kzm9d_defconfig
@@ -32,11 +32,9 @@ CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
-CONFIG_CMDLINE="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"
-CONFIG_CMDLINE_FORCE=y
CONFIG_VFP=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_SUSPEND is not set
+CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y