From a19c3b4cf7597529b5213279c186ab85ca2113e3 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sat, 15 Dec 2012 12:02:11 +0900 Subject: ARM: mach-shmobile: mackerel: update defconfig * Enable ARM_APPENDED_DTB Typically the bootloader of a mackerel board does not support DT so this option is useful * Add "rw" to command line This appears to be necessary for a successful NFS-root boot * Remove memchunk from kernel command line, it is not used outside of arch/sh * Move command line to dts This brings us one small step closer to sharing defconfig between mackerel and other boards Signed-off-by: Simon Horman --- arch/arm/configs/mackerel_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 2098ce15554..e6881accf96 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig @@ -23,7 +23,7 @@ CONFIG_AEABI=y CONFIG_FORCE_MAX_ZONEORDER=15 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m" +CONFIG_ARM_APPENDED_DTB=y CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM=y -- cgit v1.2.3-18-g5258 From a2c1d075e81a3a38236e64571c8d7669a4d3b98b Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Mon, 7 Jan 2013 11:02:08 +0900 Subject: ARM: mach-shmobile: fix memory size for kota2_defconfig The CONFIG_MEMORY_SIZE value is interpreted as a 32 bit integer, which makes sense on a system without PAE. It appears that a trailing 0 was appended to the value and after some testing it appears that 0x1e000000 is the correct value. Without this patch, building kota2_defconfig results in: /home/arnd/linux-arm/arch/arm/kernel/setup.c:790:2: warning: large integer implicitly truncated to unsigned type [-Woverflow] Reported-by: Arnd Bergmann Acked-by: Olof Johansson Signed-off-by: Simon Horman --- arch/arm/configs/kota2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/kota2_defconfig b/arch/arm/configs/kota2_defconfig index fa83db1ef0e..57ad3d47de7 100644 --- a/arch/arm/configs/kota2_defconfig +++ b/arch/arm/configs/kota2_defconfig @@ -21,7 +21,7 @@ CONFIG_ARCH_SHMOBILE=y CONFIG_KEYBOARD_GPIO_POLLED=y CONFIG_ARCH_SH73A0=y CONFIG_MACH_KOTA2=y -CONFIG_MEMORY_SIZE=0x1e0000000 +CONFIG_MEMORY_SIZE=0x1e000000 # CONFIG_SH_TIMER_TMU is not set # CONFIG_SWP_EMULATE is not set CONFIG_CPU_BPREDICT_DISABLE=y -- cgit v1.2.3-18-g5258 From be919006552ad985c83f1b3b3c1e931894be6c2f Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 27 Nov 2012 17:11:47 +0900 Subject: ARM: mach-shmobile: kzm9g: defconfig update * Enable ARM_APPENDED_DTB Typically the bootloader of a kzm9g board does not support DT so this option is useful. * Use voltage regulators by default * Move command line to dts This brings us one small step closer to sharing defconfig between kzm9g and other boards Signed-off-by: Simon Horman --- arch/arm/configs/kzm9g_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index afbae287436..670c3b60f93 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -39,7 +39,7 @@ CONFIG_AEABI=y CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200" +CONFIG_ARM_APPENDED_DTB=y CONFIG_KEXEC=y CONFIG_VFP=y CONFIG_NEON=y @@ -85,6 +85,8 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_SH_MOBILE=y CONFIG_GPIO_PCF857X=y # CONFIG_HWMON is not set +CONFIG_REGULATOR=y +CONFIG_REGULATOR_DUMMY=y CONFIG_FB=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_FRAMEBUFFER_CONSOLE=y -- cgit v1.2.3-18-g5258 From f90755d07d0baa38433d7568ccf13b0b20e154d2 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sat, 15 Dec 2012 12:02:11 +0900 Subject: 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 --- arch/arm/configs/armadillo800eva_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 2e1a8257720..f9e270149a7 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 -- cgit v1.2.3-18-g5258 From 8098df15c26b2bf16924df5a134d1a649692ab62 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sat, 15 Dec 2012 12:02:11 +0900 Subject: ARM: mach-shmobile: kzm9d: update defconfig * Do not disable SUSPEND Suspend seems to work fine on the kzm9d. This is part of an effort reduce differences between mach-shmobile defconfigs with a view to using a common defconfig. * Enable PM_RUNTIME This also seems to work fine on the kzm9d. This is part of an effort reduce differences between mach-shmobile defconfigs with a view to using a common defconfig. * Move kernel command line from defconfig to dts. This brings us one small step closer to sharing defconfig between kzm9d and other boards. Signed-off-by: Simon Horman --- arch/arm/configs/kzm9d_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig index 8c49df66cac..6c37f4a98eb 100644 --- a/arch/arm/configs/kzm9d_defconfig +++ b/arch/arm/configs/kzm9d_defconfig @@ -32,11 +32,9 @@ CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y -CONFIG_CMDLINE="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" -CONFIG_CMDLINE_FORCE=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 -- cgit v1.2.3-18-g5258