summaryrefslogtreecommitdiff
path: root/arch/arm/configs/armadillo800eva_defconfig
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2012-12-15 03:02:11 (GMT)
committerSimon Horman <horms+renesas@verge.net.au>2013-01-14 23:57:09 (GMT)
commitf90755d07d0baa38433d7568ccf13b0b20e154d2 (patch)
tree73a083537fe54c17763c81d5b598095d00edc60f /arch/arm/configs/armadillo800eva_defconfig
parentbe919006552ad985c83f1b3b3c1e931894be6c2f (diff)
downloadlinux-f90755d07d0baa38433d7568ccf13b0b20e154d2.tar.xz
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/configs/armadillo800eva_defconfig')
-rw-r--r--arch/arm/configs/armadillo800eva_defconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 2e1a825..f9e2701 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -34,12 +34,11 @@ CONFIG_AEABI=y
CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw"
-CONFIG_CMDLINE_FORCE=y
+CONFIG_ARM_APPENDED_DTB=y
CONFIG_KEXEC=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