diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 05:55:32 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 05:55:32 -0400 |
commit | ea5a4e209ddca984bbb5803b30d5e013e631f9ac (patch) | |
tree | a7f2cdb121fc44cfd7c382207104f867f93736c9 /arch/arm/mach-s5pv210/Kconfig | |
parent | fac3d3555568de1755025a9609daf492dd548a59 (diff) | |
parent | eff4c74da7944ba30feb47b51d1e9e940e6682ff (diff) |
ARM: Merge for-2635-4/s5pv210-boards
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1
Conflicts:
arch/arm/mach-s5pv210/include/mach/map.h
Diffstat (limited to 'arch/arm/mach-s5pv210/Kconfig')
-rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 5649733bf81..88f81ce2f88 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -17,10 +17,50 @@ config CPU_S5PV210 | |||
17 | help | 17 | help |
18 | Enable S5PV210 CPU support | 18 | Enable S5PV210 CPU support |
19 | 19 | ||
20 | choice | 20 | config S5PV210_SETUP_I2C1 |
21 | prompt "Select machine type" | 21 | bool |
22 | depends on ARCH_S5PV210 | 22 | help |
23 | default MACH_SMDKV210 | 23 | Common setup code for i2c bus 1. |
24 | |||
25 | config S5PV210_SETUP_I2C2 | ||
26 | bool | ||
27 | help | ||
28 | Common setup code for i2c bus 2. | ||
29 | |||
30 | config S5PV210_SETUP_FB_24BPP | ||
31 | bool | ||
32 | help | ||
33 | Common setup code for S5PV210 with an 24bpp RGB display helper. | ||
34 | |||
35 | config S5PV210_SETUP_SDHCI | ||
36 | bool | ||
37 | select S5PV210_SETUP_SDHCI_GPIO | ||
38 | help | ||
39 | Internal helper functions for S5PV210 based SDHCI systems | ||
40 | |||
41 | config S5PV210_SETUP_SDHCI_GPIO | ||
42 | bool | ||
43 | help | ||
44 | Common setup code for SDHCI gpio. | ||
45 | |||
46 | # machine support | ||
47 | |||
48 | config MACH_AQUILA | ||
49 | bool "Samsung Aquila" | ||
50 | select CPU_S5PV210 | ||
51 | select ARCH_SPARSEMEM_ENABLE | ||
52 | select S5PV210_SETUP_FB_24BPP | ||
53 | select S3C_DEV_FB | ||
54 | help | ||
55 | Machine support for the Samsung Aquila target based on S5PC110 SoC | ||
56 | |||
57 | config MACH_GONI | ||
58 | bool "GONI" | ||
59 | select CPU_S5PV210 | ||
60 | select ARCH_SPARSEMEM_ENABLE | ||
61 | help | ||
62 | Machine support for Samsung GONI board | ||
63 | S5PC110(MCP) is one of package option of S5PV210 | ||
24 | 64 | ||
25 | config MACH_SMDKV210 | 65 | config MACH_SMDKV210 |
26 | bool "SMDKV210" | 66 | bool "SMDKV210" |
@@ -39,6 +79,4 @@ config MACH_SMDKC110 | |||
39 | Machine support for Samsung SMDKC110 | 79 | Machine support for Samsung SMDKC110 |
40 | S5PC110(MCP) is one of package option of S5PV210 | 80 | S5PC110(MCP) is one of package option of S5PV210 |
41 | 81 | ||
42 | endchoice | ||
43 | |||
44 | endif | 82 | endif |