diff options
| author | Kuninori Morimoto | 2012-05-10 00:10:29 -0700 |
|---|---|---|
| committer | Rafael J. Wysocki | 2012-05-12 22:34:18 +0200 |
| commit | fecf84c14fa755b0e30ba64a290db658a06c76fb (patch) | |
| tree | 6f49de3640d94615f057e5aa4961050b791ffef6 | |
| parent | cc2504524b5b14dc03682dc1f04fb1644f692767 (diff) | |
ARM: mach-shmobile: kzm9g: enable SMP boot
Update the KZM9G defconfig and the code in platsmp.c to support SMP on
the sh73a0 based KZM9G board. Also fix up the earlyprintk setting that
was previously incorrect.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
| -rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 4bbea3639910..e3ebc20ed0a7 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -31,13 +31,15 @@ CONFIG_ARM_ERRATA_743622=y CONFIG_ARM_ERRATA_754322=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_SMP=y +CONFIG_SCHED_MC=y CONFIG_PREEMPT=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set 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=serial" +CONFIG_CMDLINE="console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200" CONFIG_KEXEC=y CONFIG_VFP=y CONFIG_NEON=y diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index 45fa3924c6a1..d959f07d1ef0 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c @@ -20,7 +20,7 @@ #include <asm/mach-types.h> #include <mach/common.h> -#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2()) +#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || machine_is_kzm9g()) #define is_r8a7779() machine_is_marzen() static unsigned int __init shmobile_smp_get_core_count(void) |