diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/Kconfig | 20 | ||||
-rw-r--r-- | arch/i386/Makefile | 6 |
2 files changed, 12 insertions, 14 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index fee589119606..e382f32d435e 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -183,7 +183,7 @@ config M386 | |||
183 | - "Winchip-C6" for original IDT Winchip. | 183 | - "Winchip-C6" for original IDT Winchip. |
184 | - "Winchip-2" for IDT Winchip 2. | 184 | - "Winchip-2" for IDT Winchip 2. |
185 | - "Winchip-2A" for IDT Winchips with 3dNow! capabilities. | 185 | - "Winchip-2A" for IDT Winchips with 3dNow! capabilities. |
186 | - "MediaGX/Geode" for Cyrix MediaGX aka Geode. | 186 | - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). |
187 | - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. | 187 | - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. |
188 | - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above). | 188 | - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above). |
189 | 189 | ||
@@ -311,12 +311,10 @@ config MWINCHIP3D | |||
311 | stores for this CPU, which can increase performance of some | 311 | stores for this CPU, which can increase performance of some |
312 | operations. | 312 | operations. |
313 | 313 | ||
314 | config MGEODE | 314 | config MGEODEGX1 |
315 | bool "MediaGX/Geode" | 315 | bool "GeodeGX1" |
316 | help | 316 | help |
317 | Select this for a Cyrix MediaGX aka Geode chip. Linux and GCC | 317 | Select this for a Geode GX1 (Cyrix MediaGX) chip. |
318 | treat this chip as a 586TSC with some extended instructions | ||
319 | and alignment reqirements. | ||
320 | 318 | ||
321 | config MCYRIXIII | 319 | config MCYRIXIII |
322 | bool "CyrixIII/VIA-C3" | 320 | bool "CyrixIII/VIA-C3" |
@@ -368,7 +366,7 @@ config X86_L1_CACHE_SHIFT | |||
368 | int | 366 | int |
369 | default "7" if MPENTIUM4 || X86_GENERIC | 367 | default "7" if MPENTIUM4 || X86_GENERIC |
370 | default "4" if X86_ELAN || M486 || M386 | 368 | default "4" if X86_ELAN || M486 || M386 |
371 | default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE | 369 | default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODEGX1 |
372 | default "6" if MK7 || MK8 || MPENTIUMM | 370 | default "6" if MK7 || MK8 || MPENTIUMM |
373 | 371 | ||
374 | config RWSEM_GENERIC_SPINLOCK | 372 | config RWSEM_GENERIC_SPINLOCK |
@@ -387,7 +385,7 @@ config GENERIC_CALIBRATE_DELAY | |||
387 | 385 | ||
388 | config X86_PPRO_FENCE | 386 | config X86_PPRO_FENCE |
389 | bool | 387 | bool |
390 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODE | 388 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 |
391 | default y | 389 | default y |
392 | 390 | ||
393 | config X86_F00F_BUG | 391 | config X86_F00F_BUG |
@@ -417,7 +415,7 @@ config X86_POPAD_OK | |||
417 | 415 | ||
418 | config X86_ALIGNMENT_16 | 416 | config X86_ALIGNMENT_16 |
419 | bool | 417 | bool |
420 | depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODE | 418 | depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 |
421 | default y | 419 | default y |
422 | 420 | ||
423 | config X86_GOOD_APIC | 421 | config X86_GOOD_APIC |
@@ -442,7 +440,7 @@ config X86_USE_3DNOW | |||
442 | 440 | ||
443 | config X86_OOSTORE | 441 | config X86_OOSTORE |
444 | bool | 442 | bool |
445 | depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MGEODE) && MTRR | 443 | depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR |
446 | default y | 444 | default y |
447 | 445 | ||
448 | config HPET_TIMER | 446 | config HPET_TIMER |
@@ -578,7 +576,7 @@ config X86_VISWS_APIC | |||
578 | 576 | ||
579 | config X86_TSC | 577 | config X86_TSC |
580 | bool | 578 | bool |
581 | depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODE) && !X86_NUMAQ | 579 | depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ |
582 | default y | 580 | default y |
583 | 581 | ||
584 | config X86_MCE | 582 | config X86_MCE |
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 04783ceb050c..1c36ca332a96 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile | |||
@@ -14,7 +14,7 @@ | |||
14 | # 19990713 Artur Skawina <skawina@geocities.com> | 14 | # 19990713 Artur Skawina <skawina@geocities.com> |
15 | # Added '-march' and '-mpreferred-stack-boundary' support | 15 | # Added '-march' and '-mpreferred-stack-boundary' support |
16 | # | 16 | # |
17 | # Kianusch Sayah Karadji <kianusch@sk-tech.net> | 17 | # 20050320 Kianusch Sayah Karadji <kianusch@sk-tech.net> |
18 | # Added support for GEODE CPU | 18 | # Added support for GEODE CPU |
19 | 19 | ||
20 | LDFLAGS := -m elf_i386 | 20 | LDFLAGS := -m elf_i386 |
@@ -54,8 +54,8 @@ cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686) | |||
54 | # AMD Elan support | 54 | # AMD Elan support |
55 | cflags-$(CONFIG_X86_ELAN) += -march=i486 | 55 | cflags-$(CONFIG_X86_ELAN) += -march=i486 |
56 | 56 | ||
57 | # MediaGX aka Geode support | 57 | # Geode GX1 support |
58 | cflags-$(CONFIG_MGEODE) += $(call cc-option,-march=pentium-mmx,-march=i586) | 58 | cflags-$(CONFIG_MGEODEGX1) += $(call cc-option,-march=pentium-mmx,-march=i486) |
59 | 59 | ||
60 | # -mregparm=3 works ok on gcc-3.0 and later | 60 | # -mregparm=3 works ok on gcc-3.0 and later |
61 | # | 61 | # |