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

Commit b297d9cd authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'defconfig' of... 

Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Defconfig updates for shmobile platforms, from Simon Horman.

* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: mach-shmobile: kzm9d: update defconfig
  ARM: mach-shmobile: armadillo: update defconfig
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: fix memory size for kota2_defconfig
  ARM: mach-shmobile: mackerel: update defconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7d1f9aef 8098df15

arch/arm/boot/dts/emev2-kzm9d.dts

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
	};



	chosen {

		bootargs = "console=ttyS1,115200n81";

		bootargs = "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";

	};

};

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

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
	model = "armadillo 800 eva";

	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 {

		device_type = "memory";

		reg = <0x40000000 0x20000000>;

arch/arm/boot/dts/sh7372-mackerel.dts

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
	model = "Mackerel (AP4 EVM 2nd)";

	compatible = "renesas,mackerel";



	chosen {

		bootargs = "console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp mem=240m rw";

	};



	memory {

		device_type = "memory";

		reg = <0x40000000 0x10000000>;

arch/arm/boot/dts/sh73a0-kzm9g.dts

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
	model = "KZM-A9-GT";

	compatible = "renesas,kzm9g", "renesas,sh73a0";



	chosen {

		bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200";

	};



	memory {

		device_type = "memory";

		reg = <0x41000000 0x1e800000>;

arch/arm/configs/armadillo800eva_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -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