Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f90755d07d0baa38433d7568ccf13b0b20e154d2

Authored by Simon Horman
1 parent be91900655
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 6 additions and 3 deletions Side-by-side Diff

arch/arm/boot/dts/r8a7740-armadillo800eva.dts
Diff comments   View file @ f90755d
... ... @@ -15,6 +15,10 @@
15 15 model = "armadillo 800 eva";
16 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 22 memory {
19 23 device_type = "memory";
20 24 reg = <0x40000000 0x20000000>;
arch/arm/configs/armadillo800eva_defconfig
Diff comments   View file @ f90755d
... ... @@ -34,12 +34,11 @@
34 34 CONFIG_FORCE_MAX_ZONEORDER=13
35 35 CONFIG_ZBOOT_ROM_TEXT=0x0
36 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"
38   -CONFIG_CMDLINE_FORCE=y
  37 +CONFIG_ARM_APPENDED_DTB=y
39 38 CONFIG_KEXEC=y
40 39 CONFIG_VFP=y
41 40 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
42   -# CONFIG_SUSPEND is not set
  41 +CONFIG_PM_RUNTIME=y
43 42 CONFIG_NET=y
44 43 CONFIG_PACKET=y
45 44 CONFIG_UNIX=y