summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-07-13 11:11:47 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-08-05 18:31:01 +0900
commit6901bbc8024524c9b4bb5d7a38c84c83e4646eeb (patch)
tree17d97d516b16fed42724943af4e43269294940b3 /arch/arm/mach-s5pv210
parent4b9a5ad567af06d8929f022c71469ada1679a367 (diff)
ARM: s5pv210_defconfig: Update for removing s5pc110_defconfig
Now that S5PC110 machines and S5PV210 machines can be built into one kernel, update mach-s5pv210/Kconfig and s5pv210_defconfig. Tested on Aquila(S5PC110), GONI(S5PC110), SMDKC110(S5PC110) and SMDKV210(S5PV210). Created and tested against linux-2.6.35-rc5. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/Kconfig32
1 files changed, 19 insertions, 13 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index d7c40179585..e65825f47f0 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -48,10 +48,10 @@ config S5PV210_SETUP_SDHCI_GPIO
help
Common setup code for SDHCI gpio.
-# machine support
+menu "S5PC110 Machines"
config MACH_AQUILA
- bool "Samsung Aquila"
+ bool "Aquila"
select CPU_S5PV210
select ARCH_SPARSEMEM_ENABLE
select S5PV210_SETUP_FB_24BPP
@@ -71,11 +71,27 @@ config MACH_GONI
Machine support for Samsung GONI board
S5PC110(MCP) is one of package option of S5PV210
+config MACH_SMDKC110
+ bool "SMDKC110"
+ select CPU_S5PV210
+ select ARCH_SPARSEMEM_ENABLE
+ select SAMSUNG_DEV_IDE
+ select S3C_DEV_WDT
+ select HAVE_S3C2410_WATCHDOG
+ select S5PV210_SETUP_IDE
+ help
+ Machine support for Samsung SMDKC110
+ S5PC110(MCP) is one of package option of S5PV210
+
+endmenu
+
config S5PC110_DEV_ONENAND
bool
help
Compile in platform device definition for OneNAND1 controller
+menu "S5PV210 Machines"
+
config MACH_SMDKV210
bool "SMDKV210"
select CPU_S5PV210
@@ -89,16 +105,6 @@ config MACH_SMDKV210
help
Machine support for Samsung SMDKV210
-config MACH_SMDKC110
- bool "SMDKC110"
- select CPU_S5PV210
- select ARCH_SPARSEMEM_ENABLE
- select SAMSUNG_DEV_IDE
- select S3C_DEV_WDT
- select HAVE_S3C2410_WATCHDOG
- select S5PV210_SETUP_IDE
- help
- Machine support for Samsung SMDKC110
- S5PC110(MCP) is one of package option of S5PV210
+endmenu
endif