diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2012-12-14 22:02:11 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-14 18:57:09 -0500 |
commit | f90755d07d0baa38433d7568ccf13b0b20e154d2 (patch) | |
tree | 73a083537fe54c17763c81d5b598095d00edc60f /arch | |
parent | be919006552ad985c83f1b3b3c1e931894be6c2f (diff) |
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')
-rw-r--r-- | arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 | ||||
-rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 5 |
2 files changed, 6 insertions, 3 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 @@ | |||
15 | model = "armadillo 800 eva"; | 15 | model = "armadillo 800 eva"; |
16 | compatible = "renesas,armadillo800eva"; | 16 | compatible = "renesas,armadillo800eva"; |
17 | 17 | ||
18 | chosen { | ||
19 | bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw"; | ||
20 | }; | ||
21 | |||
18 | memory { | 22 | memory { |
19 | device_type = "memory"; | 23 | device_type = "memory"; |
20 | reg = <0x40000000 0x20000000>; | 24 | reg = <0x40000000 0x20000000>; |
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 2e1a82577207..f9e270149a77 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig | |||
@@ -34,12 +34,11 @@ CONFIG_AEABI=y | |||
34 | CONFIG_FORCE_MAX_ZONEORDER=13 | 34 | CONFIG_FORCE_MAX_ZONEORDER=13 |
35 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 35 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
36 | CONFIG_ZBOOT_ROM_BSS=0x0 | 36 | CONFIG_ZBOOT_ROM_BSS=0x0 |
37 | 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" | 37 | CONFIG_ARM_APPENDED_DTB=y |
38 | CONFIG_CMDLINE_FORCE=y | ||
39 | CONFIG_KEXEC=y | 38 | CONFIG_KEXEC=y |
40 | CONFIG_VFP=y | 39 | CONFIG_VFP=y |
41 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 40 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
42 | # CONFIG_SUSPEND is not set | 41 | CONFIG_PM_RUNTIME=y |
43 | CONFIG_NET=y | 42 | CONFIG_NET=y |
44 | CONFIG_PACKET=y | 43 | CONFIG_PACKET=y |
45 | CONFIG_UNIX=y | 44 | CONFIG_UNIX=y |