diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2010-09-29 08:29:27 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-20 18:54:55 -0400 |
| commit | eecb6a8420fde47ebc37d03f72ef6dcb8e93c0ef (patch) | |
| tree | 24839474d74fd24d2a8a4e88c15b0fa8cb14606e | |
| parent | 50442b55e3a96c98229b36d1bcca0c5c4d81fe15 (diff) | |
ARM: S5PV210: Place the common SPARSEMEM at ARCH_S5PV210
In case of S5PV210/S5PC110, it uses the SPARSEMEM as default memory
configuration. So moved to ARCH_S5PV210 config.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: edited title]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fe3cf37c5dd5..7f2fed102958 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -717,6 +717,7 @@ config ARCH_S5PC100 | |||
| 717 | config ARCH_S5PV210 | 717 | config ARCH_S5PV210 |
| 718 | bool "Samsung S5PV210/S5PC110" | 718 | bool "Samsung S5PV210/S5PC110" |
| 719 | select CPU_V7 | 719 | select CPU_V7 |
| 720 | select ARCH_SPARSEMEM_ENABLE | ||
| 720 | select GENERIC_GPIO | 721 | select GENERIC_GPIO |
| 721 | select HAVE_CLK | 722 | select HAVE_CLK |
| 722 | select ARM_L1_CACHE_SHIFT_6 | 723 | select ARM_L1_CACHE_SHIFT_6 |
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 42a55f28f154..842fad761f52 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
| @@ -58,7 +58,6 @@ menu "S5PC110 Machines" | |||
| 58 | config MACH_AQUILA | 58 | config MACH_AQUILA |
| 59 | bool "Aquila" | 59 | bool "Aquila" |
| 60 | select CPU_S5PV210 | 60 | select CPU_S5PV210 |
| 61 | select ARCH_SPARSEMEM_ENABLE | ||
| 62 | select S3C_DEV_FB | 61 | select S3C_DEV_FB |
| 63 | select S5P_DEV_FIMC0 | 62 | select S5P_DEV_FIMC0 |
| 64 | select S5P_DEV_FIMC1 | 63 | select S5P_DEV_FIMC1 |
| @@ -75,7 +74,6 @@ config MACH_AQUILA | |||
| 75 | config MACH_GONI | 74 | config MACH_GONI |
| 76 | bool "GONI" | 75 | bool "GONI" |
| 77 | select CPU_S5PV210 | 76 | select CPU_S5PV210 |
| 78 | select ARCH_SPARSEMEM_ENABLE | ||
| 79 | select S3C_DEV_FB | 77 | select S3C_DEV_FB |
| 80 | select S5P_DEV_FIMC0 | 78 | select S5P_DEV_FIMC0 |
| 81 | select S5P_DEV_FIMC1 | 79 | select S5P_DEV_FIMC1 |
| @@ -95,7 +93,6 @@ config MACH_GONI | |||
| 95 | config MACH_SMDKC110 | 93 | config MACH_SMDKC110 |
| 96 | bool "SMDKC110" | 94 | bool "SMDKC110" |
| 97 | select CPU_S5PV210 | 95 | select CPU_S5PV210 |
| 98 | select ARCH_SPARSEMEM_ENABLE | ||
| 99 | select S3C_DEV_I2C1 | 96 | select S3C_DEV_I2C1 |
| 100 | select S3C_DEV_I2C2 | 97 | select S3C_DEV_I2C2 |
| 101 | select S3C_DEV_RTC | 98 | select S3C_DEV_RTC |
| @@ -115,7 +112,6 @@ menu "S5PV210 Machines" | |||
| 115 | config MACH_SMDKV210 | 112 | config MACH_SMDKV210 |
| 116 | bool "SMDKV210" | 113 | bool "SMDKV210" |
| 117 | select CPU_S5PV210 | 114 | select CPU_S5PV210 |
| 118 | select ARCH_SPARSEMEM_ENABLE | ||
| 119 | select S3C_DEV_HSMMC | 115 | select S3C_DEV_HSMMC |
| 120 | select S3C_DEV_HSMMC1 | 116 | select S3C_DEV_HSMMC1 |
| 121 | select S3C_DEV_HSMMC2 | 117 | select S3C_DEV_HSMMC2 |