summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-26 11:35:59 -0700
committerOlof Johansson <olof@lixom.net>2013-04-26 11:35:59 -0700
commit772ba2ffd2033ecc4451c10b20c01814156ee1b1 (patch)
treec3d7b3f1441bd900e3c8e22e1c37eed954c2fd41 /arch/arm/mach-exynos/Kconfig
parentf19814721e24cac152348872ff38f38a3b45852a (diff)
parent4923ee444a39c8b75027ed01a7812e940194dbec (diff)
Merge branch 'samsung/exynos-multiplatform' into next/multiplatform
This just merges in the revert of multiplatform support. Not doing it by cherry-pick since we need the same revert in the next/drivers branch. * samsung/exynos-multiplatform: Revert "ARM: exynos: enable multiplatform support" Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
-rw-r--r--arch/arm/mach-exynos/Kconfig25
1 files changed, 4 insertions, 21 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 9cfbb33a9eea..4b8b9ec91ff4 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -7,20 +7,6 @@
# Configuration options for the EXYNOS4
-config ARCH_EXYNOS
- # TODO: make this visible after all drivers are converted
- bool "Samsung EXYNOS" if ARCH_MULTI_V7 && BROKEN
- default ARCH_EXYNOS_SINGLE
- select ARCH_HAS_CPUFREQ
- select CLKDEV_LOOKUP
- select CPU_V7
- select GENERIC_CLOCKEVENTS
- select HAVE_CLK
- select HAVE_S3C2410_I2C if I2C
- select HAVE_S3C_RTC if RTC_CLASS
- help
- Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
-
if ARCH_EXYNOS
menu "SAMSUNG EXYNOS SoCs Support"
@@ -34,9 +20,6 @@ config ARCH_EXYNOS4
help
Samsung EXYNOS4 SoCs based systems
-config ARCH_EXYNOS4_SINGLE
- def_bool ARCH_EXYNOS4 && ARCH_EXYNOS_SINGLE
-
config ARCH_EXYNOS5
bool "SAMSUNG EXYNOS5"
select HAVE_ARM_SCU if SMP
@@ -54,7 +37,7 @@ config CPU_EXYNOS4210
select PM_GENERIC_DOMAINS
select S5P_PM if PM
select S5P_SLEEP if PM
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS4210 CPU support
@@ -64,7 +47,7 @@ config SOC_EXYNOS4212
depends on ARCH_EXYNOS4
select S5P_PM if PM
select S5P_SLEEP if PM
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS4212 SoC support
@@ -72,7 +55,7 @@ config SOC_EXYNOS4412
bool "SAMSUNG EXYNOS4412"
default y
depends on ARCH_EXYNOS4
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS4412 SoC support
@@ -83,7 +66,7 @@ config SOC_EXYNOS5250
select S5P_PM if PM
select S5P_SLEEP if PM
select S5P_DEV_MFC
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS5250 SoC support