aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorChanghwan Youn <chaos.youn@samsung.com>2010-07-15 23:15:38 -0400
committerKukjin Kim <kgene.kim@samsung.com>2010-08-05 05:32:42 -0400
commitcc0e72b87a4afb520fab09b67e1c16e4ec4aaadb (patch)
treee105572441c714d86c84d611f375dd1c32f372c6 /arch/arm/Kconfig
parentcfca3a619baeaba3a0037fef5da48108e9c0bb1c (diff)
ARM: S5PV310: Add new Kconfig and Makefiles
This patch adds the Kconfig and Makefile for the new S5PV310 SoC. It also updates arch/arm Kconfig, Makefile and arch/arm/mm/Kconfig to include support for the new S5PV310. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig24
1 files changed, 19 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 98922f7d2d12..3e68a93ce71f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -704,6 +704,15 @@ config ARCH_S5PV210
704 help 704 help
705 Samsung S5PV210/S5PC110 series based systems 705 Samsung S5PV210/S5PC110 series based systems
706 706
707config ARCH_S5PV310
708 bool "Samsung S5PV310/S5PC210"
709 select CPU_V7
710 select GENERIC_GPIO
711 select HAVE_CLK
712 select GENERIC_CLOCKEVENTS
713 help
714 Samsung S5PV310 series based systems
715
707config ARCH_SHARK 716config ARCH_SHARK
708 bool "Shark" 717 bool "Shark"
709 select CPU_SA110 718 select CPU_SA110
@@ -904,6 +913,8 @@ source "arch/arm/mach-s5pc100/Kconfig"
904 913
905source "arch/arm/mach-s5pv210/Kconfig" 914source "arch/arm/mach-s5pv210/Kconfig"
906 915
916source "arch/arm/mach-s5pv310/Kconfig"
917
907source "arch/arm/mach-shmobile/Kconfig" 918source "arch/arm/mach-shmobile/Kconfig"
908 919
909source "arch/arm/plat-stmp3xxx/Kconfig" 920source "arch/arm/plat-stmp3xxx/Kconfig"
@@ -1100,10 +1111,11 @@ config SMP
1100 bool "Symmetric Multi-Processing (EXPERIMENTAL)" 1111 bool "Symmetric Multi-Processing (EXPERIMENTAL)"
1101 depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\ 1112 depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
1102 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\ 1113 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
1103 ARCH_U8500 || ARCH_VEXPRESS_CA9X4) 1114 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310)
1104 depends on GENERIC_CLOCKEVENTS 1115 depends on GENERIC_CLOCKEVENTS
1105 select USE_GENERIC_SMP_HELPERS 1116 select USE_GENERIC_SMP_HELPERS
1106 select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4) 1117 select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\
1118 ARCH_S5PV310)
1107 help 1119 help
1108 This enables support for systems with more than one CPU. If you have 1120 This enables support for systems with more than one CPU. If you have
1109 a system with only one CPU, like most personal computers, say N. If 1121 a system with only one CPU, like most personal computers, say N. If
@@ -1172,9 +1184,10 @@ config HOTPLUG_CPU
1172config LOCAL_TIMERS 1184config LOCAL_TIMERS
1173 bool "Use local timer interrupts" 1185 bool "Use local timer interrupts"
1174 depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \ 1186 depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
1175 REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || ARCH_U8500) 1187 REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
1188 ARCH_U8500 || ARCH_S5PV310)
1176 default y 1189 default y
1177 select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500) 1190 select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310)
1178 help 1191 help
1179 Enable support for local timers on SMP platforms, rather then the 1192 Enable support for local timers on SMP platforms, rather then the
1180 legacy IPI broadcast method. Local timers allows the system 1193 legacy IPI broadcast method. Local timers allows the system
@@ -1186,7 +1199,8 @@ source kernel/Kconfig.preempt
1186config HZ 1199config HZ
1187 int 1200 int
1188 default 128 if ARCH_L7200 1201 default 128 if ARCH_L7200
1189 default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210 1202 default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || \
1203 ARCH_S5PV210 || ARCH_S5PV310
1190 default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER 1204 default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
1191 default AT91_TIMER_HZ if ARCH_AT91 1205 default AT91_TIMER_HZ if ARCH_AT91
1192 default 100 1206 default 100