summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-26 11:32:02 -0700
committerOlof Johansson <olof@lixom.net>2013-04-26 11:35:51 -0700
commit4923ee444a39c8b75027ed01a7812e940194dbec (patch)
tree660146f078a65463590d9b623d2a37bb263a6b29 /arch/arm/mach-exynos/Kconfig
parentbd51de53e1be9896d815bbea30560262216d4616 (diff)
downloadop-kernel-dev-4923ee444a39c8b75027ed01a7812e940194dbec.zip
op-kernel-dev-4923ee444a39c8b75027ed01a7812e940194dbec.tar.gz
Revert "ARM: exynos: enable multiplatform support"
This reverts commit bd51de53e1be9896d815bbea30560262216d4616. Turns out that multiplatform breaks some uses cases, such as when you have an existing defconfig, since it adds the new EXYNOS_SINGLE config option as a dependecy. As a result, nearly all exynos config options will be disabled by default. Reverting instead of rebasing since this branch is pulled in as a dependency elsewhere. 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 1d69c62..d8c251b 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"
@@ -33,9 +19,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_SMP
@@ -52,7 +35,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
@@ -62,7 +45,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
@@ -70,7 +53,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
@@ -81,7 +64,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
OpenPOWER on IntegriCloud