aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-11-06 00:54:56 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-11-06 00:54:56 -0400
commit830145796a5c8f1ca3f87ea619063c1d99a57df5 (patch)
treee72a0ecacfcce228c46d93c946cfd65a44cc1fd3 /arch/arm/Kconfig
parente700e41d9abfbf9fee01e979a41b185695132c19 (diff)
ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos
The arch/arm/mach-exynos4 directory (CONFIG_ARCH_EXYNOS4) has made for plaforms based on EXYNOS4 SoCs. But since upcoming Samsung's SoCs such as EXYNOS5 (ARM Cortex A15) can reuse most codes in current mach-exynos4, one mach-exynos directory will be used for them. This patch changes to CONFIG_ARCH_EXYNOS (arch/arm/mach-exynos) but keeps original CONFIG_ARCH_EXYNOS4 in mach-exynos/Kconfig to avoid changing in driver side. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2bda424c1b2b..44789eff983f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -837,8 +837,8 @@ config ARCH_S5PV210
837 help 837 help
838 Samsung S5PV210/S5PC110 series based systems 838 Samsung S5PV210/S5PC110 series based systems
839 839
840config ARCH_EXYNOS4 840config ARCH_EXYNOS
841 bool "Samsung EXYNOS4" 841 bool "SAMSUNG EXYNOS"
842 select CPU_V7 842 select CPU_V7
843 select ARCH_SPARSEMEM_ENABLE 843 select ARCH_SPARSEMEM_ENABLE
844 select ARCH_HAS_HOLES_MEMORYMODEL 844 select ARCH_HAS_HOLES_MEMORYMODEL
@@ -852,7 +852,7 @@ config ARCH_EXYNOS4
852 select HAVE_S3C2410_WATCHDOG if WATCHDOG 852 select HAVE_S3C2410_WATCHDOG if WATCHDOG
853 select NEED_MACH_MEMORY_H 853 select NEED_MACH_MEMORY_H
854 help 854 help
855 Samsung EXYNOS4 series based systems 855 Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
856 856
857config ARCH_SHARK 857config ARCH_SHARK
858 bool "Shark" 858 bool "Shark"
@@ -1079,7 +1079,7 @@ source "arch/arm/mach-s5pc100/Kconfig"
1079 1079
1080source "arch/arm/mach-s5pv210/Kconfig" 1080source "arch/arm/mach-s5pv210/Kconfig"
1081 1081
1082source "arch/arm/mach-exynos4/Kconfig" 1082source "arch/arm/mach-exynos/Kconfig"
1083 1083
1084source "arch/arm/mach-shmobile/Kconfig" 1084source "arch/arm/mach-shmobile/Kconfig"
1085 1085