Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f90755d0 authored Dec 15, 2012 by Simon Horman

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>

parent be919006

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,10 @@
	model = "armadillo 800 eva";		model = "armadillo 800 eva";
	compatible = "renesas,armadillo800eva";		compatible = "renesas,armadillo800eva";

			chosen {
			bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw";
			};

	memory {		memory {
	device_type = "memory";		device_type = "memory";
	reg = <0x40000000 0x20000000>;		reg = <0x40000000 0x20000000>;

arch/arm/configs/armadillo800eva_defconfig

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -34,12 +34,11 @@ CONFIG_AEABI=y
	CONFIG_FORCE_MAX_ZONEORDER=13		CONFIG_FORCE_MAX_ZONEORDER=13
	CONFIG_ZBOOT_ROM_TEXT=0x0		CONFIG_ZBOOT_ROM_TEXT=0x0
	CONFIG_ZBOOT_ROM_BSS=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_ARM_APPENDED_DTB=y
	CONFIG_CMDLINE_FORCE=y
	CONFIG_KEXEC=y		CONFIG_KEXEC=y
	CONFIG_VFP=y		CONFIG_VFP=y
	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
	# CONFIG_SUSPEND is not set		CONFIG_PM_RUNTIME=y
	CONFIG_NET=y		CONFIG_NET=y
	CONFIG_PACKET=y		CONFIG_PACKET=y
	CONFIG_UNIX=y		CONFIG_UNIX=y