aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorRavikiran G Thirumalai <kiran@scalex86.org>2009-02-09 21:18:14 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-11 08:17:40 -0500
commitc5c606d9dce6e0852a401c57a8b0542acdbb6796 (patch)
treece822e48579635dac9394122e8127700cfdb0a39 /arch/x86/Kconfig
parent160d8dac12932ad6eb4a359b66521e2e3282ea7d (diff)
x86: cleanup, rename CONFIG_X86_NON_STANDARD to CONFIG_X86_EXTENDED_PLATFORM
Patch to rename the CONFIG_X86_NON_STANDARD to CONFIG_X86_EXTENDED_PLATFORM. The new name represents the subarches better. Also, default this to 'y' so that many of the sub architectures that were not easily visible now become visible. Also re-organize the extended architecture platform and non standard platform list alphabetically as suggested by Ingo. Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org> Signed-off-by: Shai Fultheim <shai@scalex86.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig83
1 files changed, 46 insertions, 37 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 270ecf90bdb4..4a27aa41f6df 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -268,65 +268,48 @@ config X86_BIGSMP
268 ---help--- 268 ---help---
269 This option is needed for the systems that have more than 8 CPUs 269 This option is needed for the systems that have more than 8 CPUs
270 270
271config X86_NON_STANDARD 271config X86_EXTENDED_PLATFORM
272 bool "Support for non-standard x86 platforms" 272 bool "Support for extended (non-PC) x86 platforms"
273 default y
273 ---help--- 274 ---help---
274 If you disable this option then the kernel will only support 275 If you disable this option then the kernel will only support
275 standard PC platforms. (which covers the vast majority of 276 standard PC platforms. (which covers the vast majority of
276 systems out there.) 277 systems out there.)
277 278
278 If you enable this option then you'll be able to select a number 279 If you enable this option then you'll be able to select a number
279 of less common non-PC x86 platforms: VisWS, RDC321, SGI/UV. 280 of non-PC x86 platforms.
280 281
281 If you have one of these systems, or if you want to build a 282 If you have one of these systems, or if you want to build a
282 generic distribution kernel, say Y here - otherwise say N. 283 generic distribution kernel, say Y here - otherwise say N.
283 284
284config X86_VISWS 285# This is an alphabetically sorted list of 64 bit extended platforms
285 bool "SGI 320/540 (Visual Workstation)" 286# Please maintain the alphabetic order if and when there are additions
286 depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT
287 depends on X86_NON_STANDARD
288 ---help---
289 The SGI Visual Workstation series is an IA32-based workstation
290 based on SGI systems chips with some legacy PC hardware attached.
291 287
292 Say Y here to create a kernel to run on the SGI 320 or 540. 288config X86_VSMP
293 289 bool "ScaleMP vSMP"
294 A kernel compiled for the Visual Workstation will run on general 290 select PARAVIRT
295 PCs as well. See <file:Documentation/sgi-visws.txt> for details. 291 depends on X86_64 && PCI
296 292 depends on X86_EXTENDED_PLATFORM
297config X86_RDC321X
298 bool "RDC R-321x SoC"
299 depends on X86_32
300 depends on X86_NON_STANDARD
301 select M486
302 select X86_REBOOTFIXUPS
303 ---help--- 293 ---help---
304 This option is needed for RDC R-321x system-on-chip, also known 294 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
305 as R-8610-(G). 295 supposed to run on these EM64T-based machines. Only choose this option
306 If you don't have one of these chips, you should say N here. 296 if you have one of these machines.
307 297
308config X86_UV 298config X86_UV
309 bool "SGI Ultraviolet" 299 bool "SGI Ultraviolet"
310 depends on X86_64 300 depends on X86_64
311 depends on X86_NON_STANDARD 301 depends on X86_EXTENDED_PLATFORM
312 ---help--- 302 ---help---
313 This option is needed in order to support SGI Ultraviolet systems. 303 This option is needed in order to support SGI Ultraviolet systems.
314 If you don't have one of these, you should say N here. 304 If you don't have one of these, you should say N here.
315 305
316config X86_VSMP 306# Following is an alphabetically sorted list of 32 bit extended platforms
317 bool "Support for ScaleMP vSMP" 307# Please maintain the alphabetic order if and when there are additions
318 select PARAVIRT
319 depends on X86_64 && PCI
320 depends on X86_NON_STANDARD
321 ---help---
322 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
323 supposed to run on these EM64T-based machines. Only choose this option
324 if you have one of these machines.
325 308
326config X86_ELAN 309config X86_ELAN
327 bool "AMD Elan" 310 bool "AMD Elan"
328 depends on X86_32 311 depends on X86_32
329 depends on X86_NON_STANDARD 312 depends on X86_EXTENDED_PLATFORM
330 ---help--- 313 ---help---
331 Select this for an AMD Elan processor. 314 Select this for an AMD Elan processor.
332 315
@@ -334,16 +317,29 @@ config X86_ELAN
334 317
335 If unsure, choose "PC-compatible" instead. 318 If unsure, choose "PC-compatible" instead.
336 319
320config X86_RDC321X
321 bool "RDC R-321x SoC"
322 depends on X86_32
323 depends on X86_EXTENDED_PLATFORM
324 select M486
325 select X86_REBOOTFIXUPS
326 ---help---
327 This option is needed for RDC R-321x system-on-chip, also known
328 as R-8610-(G).
329 If you don't have one of these chips, you should say N here.
330
337config X86_32_NON_STANDARD 331config X86_32_NON_STANDARD
338 bool "Support non-standard 32-bit SMP architectures" 332 bool "Support non-standard 32-bit SMP architectures"
339 depends on X86_32 && SMP 333 depends on X86_32 && SMP
340 depends on X86_NON_STANDARD 334 depends on X86_EXTENDED_PLATFORM
341 ---help--- 335 ---help---
342 This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default 336 This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
343 subarchitectures. It is intended for a generic binary kernel. 337 subarchitectures. It is intended for a generic binary kernel.
344 if you select them all, kernel will probe it one by one. and will 338 if you select them all, kernel will probe it one by one. and will
345 fallback to default. 339 fallback to default.
346 340
341# Alphabetically sorted list of Non standard 32 bit platforms
342
347config X86_NUMAQ 343config X86_NUMAQ
348 bool "NUMAQ (IBM/Sequent)" 344 bool "NUMAQ (IBM/Sequent)"
349 depends on X86_32_NON_STANDARD 345 depends on X86_32_NON_STANDARD
@@ -356,6 +352,19 @@ config X86_NUMAQ
356 of Flat Logical. You will need a new lynxer.elf file to flash your 352 of Flat Logical. You will need a new lynxer.elf file to flash your
357 firmware with - send email to <Martin.Bligh@us.ibm.com>. 353 firmware with - send email to <Martin.Bligh@us.ibm.com>.
358 354
355config X86_VISWS
356 bool "SGI 320/540 (Visual Workstation)"
357 depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT
358 depends on X86_32_NON_STANDARD
359 ---help---
360 The SGI Visual Workstation series is an IA32-based workstation
361 based on SGI systems chips with some legacy PC hardware attached.
362
363 Say Y here to create a kernel to run on the SGI 320 or 540.
364
365 A kernel compiled for the Visual Workstation will run on general
366 PCs as well. See <file:Documentation/sgi-visws.txt> for details.
367
359config X86_SUMMIT 368config X86_SUMMIT
360 bool "Summit/EXA (IBM x440)" 369 bool "Summit/EXA (IBM x440)"
361 depends on X86_32_NON_STANDARD 370 depends on X86_32_NON_STANDARD
@@ -364,7 +373,7 @@ config X86_SUMMIT
364 In particular, it is needed for the x440. 373 In particular, it is needed for the x440.
365 374
366config X86_ES7000 375config X86_ES7000
367 bool "Support for Unisys ES7000 IA32 series" 376 bool "Unisys ES7000 IA32 series"
368 depends on X86_32_NON_STANDARD && X86_BIGSMP 377 depends on X86_32_NON_STANDARD && X86_BIGSMP
369 ---help--- 378 ---help---
370 Support for Unisys ES7000 systems. Say 'Y' here if this kernel is 379 Support for Unisys ES7000 systems. Say 'Y' here if this kernel is