diff options
author | Michal Simek <monstr@monstr.eu> | 2010-02-22 05:33:07 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-03-11 08:13:34 -0500 |
commit | b8a84059b5c3a3b9ba3973dcdab1e1d9cc4975e0 (patch) | |
tree | b009744d4ed75cdcc6f3d2fa04eab04ed20ff470 /arch/microblaze | |
parent | cca5613f0278fb0ae0aba285a496add55d0cabab (diff) |
microblaze: Remove ancient Kconfig option for consistent mapping
We don't use CONSISTENT option from Kconfig that's why I am removing them.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/Kconfig | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index c1e731bb3301..e451c0898e7a 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
@@ -145,7 +145,6 @@ menu "Advanced setup" | |||
145 | 145 | ||
146 | config ADVANCED_OPTIONS | 146 | config ADVANCED_OPTIONS |
147 | bool "Prompt for advanced kernel configuration options" | 147 | bool "Prompt for advanced kernel configuration options" |
148 | depends on MMU | ||
149 | help | 148 | help |
150 | This option will enable prompting for a variety of advanced kernel | 149 | This option will enable prompting for a variety of advanced kernel |
151 | configuration options. These options can cause the kernel to not | 150 | configuration options. These options can cause the kernel to not |
@@ -174,7 +173,7 @@ config HIGHMEM_START | |||
174 | 173 | ||
175 | config LOWMEM_SIZE_BOOL | 174 | config LOWMEM_SIZE_BOOL |
176 | bool "Set maximum low memory" | 175 | bool "Set maximum low memory" |
177 | depends on ADVANCED_OPTIONS | 176 | depends on ADVANCED_OPTIONS && MMU |
178 | help | 177 | help |
179 | This option allows you to set the maximum amount of memory which | 178 | This option allows you to set the maximum amount of memory which |
180 | will be used as "low memory", that is, memory which the kernel can | 179 | will be used as "low memory", that is, memory which the kernel can |
@@ -186,7 +185,6 @@ config LOWMEM_SIZE_BOOL | |||
186 | 185 | ||
187 | config LOWMEM_SIZE | 186 | config LOWMEM_SIZE |
188 | hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL | 187 | hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL |
189 | depends on MMU | ||
190 | default "0x30000000" | 188 | default "0x30000000" |
191 | 189 | ||
192 | config KERNEL_START_BOOL | 190 | config KERNEL_START_BOOL |
@@ -207,7 +205,7 @@ config KERNEL_START | |||
207 | 205 | ||
208 | config TASK_SIZE_BOOL | 206 | config TASK_SIZE_BOOL |
209 | bool "Set custom user task size" | 207 | bool "Set custom user task size" |
210 | depends on ADVANCED_OPTIONS | 208 | depends on ADVANCED_OPTIONS && MMU |
211 | help | 209 | help |
212 | This option allows you to set the amount of virtual address space | 210 | This option allows you to set the amount of virtual address space |
213 | allocated to user tasks. This can be useful in optimizing the | 211 | allocated to user tasks. This can be useful in optimizing the |
@@ -217,35 +215,8 @@ config TASK_SIZE_BOOL | |||
217 | 215 | ||
218 | config TASK_SIZE | 216 | config TASK_SIZE |
219 | hex "Size of user task space" if TASK_SIZE_BOOL | 217 | hex "Size of user task space" if TASK_SIZE_BOOL |
220 | depends on MMU | ||
221 | default "0x80000000" | 218 | default "0x80000000" |
222 | 219 | ||
223 | config CONSISTENT_START_BOOL | ||
224 | bool "Set custom consistent memory pool address" | ||
225 | depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE | ||
226 | help | ||
227 | This option allows you to set the base virtual address | ||
228 | of the the consistent memory pool. This pool of virtual | ||
229 | memory is used to make consistent memory allocations. | ||
230 | |||
231 | config CONSISTENT_START | ||
232 | hex "Base virtual address of consistent memory pool" if CONSISTENT_START_BOOL | ||
233 | depends on MMU | ||
234 | default "0xff100000" if NOT_COHERENT_CACHE | ||
235 | |||
236 | config CONSISTENT_SIZE_BOOL | ||
237 | bool "Set custom consistent memory pool size" | ||
238 | depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE | ||
239 | help | ||
240 | This option allows you to set the size of the the | ||
241 | consistent memory pool. This pool of virtual memory | ||
242 | is used to make consistent memory allocations. | ||
243 | |||
244 | config CONSISTENT_SIZE | ||
245 | hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL | ||
246 | depends on MMU | ||
247 | default "0x00200000" if NOT_COHERENT_CACHE | ||
248 | |||
249 | endmenu | 220 | endmenu |
250 | 221 | ||
251 | source "mm/Kconfig" | 222 | source "mm/Kconfig" |