public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 08:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] x86: geode support fixes

Browse source 
- Changed Name/defines from "Geode GX" to "Geode GX1" for clarification

- Dropped "-march=i586" in favor of "-march=i486"

- Dopped X86_OOSTORE support for Geode GX1

Signed-off-by: Kianusch Sayah Karadji <kianusch@sk-tech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Kianusch Sayah Karadji 2005-05-05 16:16:17 -07:00 • committed by Linus Torvalds
parent 02c30a84e6
commit 4713741955
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/i386/Kconfig
View file

@ -183,7 +183,7 @@ config M386
- "Winchip-C6" for original IDT Winchip. - "Winchip-C6" for original IDT Winchip.
- "Winchip-2" for IDT Winchip 2. - "Winchip-2" for IDT Winchip 2.
- "Winchip-2A" for IDT Winchips with 3dNow! capabilities. - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
- "MediaGX/Geode" for Cyrix MediaGX aka Geode. - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).
- "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
- "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above). - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
@ -311,12 +311,10 @@ config MWINCHIP3D
stores for this CPU, which can increase performance of some stores for this CPU, which can increase performance of some
operations. operations.
config MGEODE config MGEODEGX1
bool "MediaGX/Geode" bool "GeodeGX1"
help help
Select this for a Cyrix MediaGX aka Geode chip. Linux and GCC Select this for a Geode GX1 (Cyrix MediaGX) chip.
treat this chip as a 586TSC with some extended instructions
and alignment reqirements.
config MCYRIXIII config MCYRIXIII
bool "CyrixIII/VIA-C3" bool "CyrixIII/VIA-C3"
@ -368,7 +366,7 @@ config X86_L1_CACHE_SHIFT
int int
default "7" if MPENTIUM4 || X86_GENERIC default "7" if MPENTIUM4 || X86_GENERIC
default "4" if X86_ELAN || M486 || M386 default "4" if X86_ELAN || M486 || M386
default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODEGX1
default "6" if MK7 || MK8 || MPENTIUMM default "6" if MK7 || MK8 || MPENTIUMM
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
@ -387,7 +385,7 @@ config GENERIC_CALIBRATE_DELAY
config X86_PPRO_FENCE config X86_PPRO_FENCE
bool bool
depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODE depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1
default y default y
config X86_F00F_BUG config X86_F00F_BUG
@ -417,7 +415,7 @@ config X86_POPAD_OK
config X86_ALIGNMENT_16 config X86_ALIGNMENT_16
bool bool
depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODE depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
default y default y
config X86_GOOD_APIC config X86_GOOD_APIC
@ -442,7 +440,7 @@ config X86_USE_3DNOW
config X86_OOSTORE config X86_OOSTORE
bool bool
depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MGEODE) && MTRR depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR
default y default y
config HPET_TIMER config HPET_TIMER
@ -578,7 +576,7 @@ config X86_VISWS_APIC
config X86_TSC config X86_TSC
bool bool
depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODE) && !X86_NUMAQ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ
default y default y
config X86_MCE config X86_MCE

6
arch/i386/Makefile
View file

@ -14,7 +14,7 @@
# 19990713 Artur Skawina <skawina@geocities.com> # 19990713 Artur Skawina <skawina@geocities.com>
# Added '-march' and '-mpreferred-stack-boundary' support # Added '-march' and '-mpreferred-stack-boundary' support
# #
# Kianusch Sayah Karadji <kianusch@sk-tech.net> # 20050320 Kianusch Sayah Karadji <kianusch@sk-tech.net>
# Added support for GEODE CPU # Added support for GEODE CPU
LDFLAGS := -m elf_i386 LDFLAGS := -m elf_i386
@ -54,8 +54,8 @@ cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686)
# AMD Elan support # AMD Elan support
cflags-$(CONFIG_X86_ELAN) += -march=i486 cflags-$(CONFIG_X86_ELAN) += -march=i486
# MediaGX aka Geode support # Geode GX1 support
cflags-$(CONFIG_MGEODE) += $(call cc-option,-march=pentium-mmx,-march=i586) cflags-$(CONFIG_MGEODEGX1) += $(call cc-option,-march=pentium-mmx,-march=i486)
# -mregparm=3 works ok on gcc-3.0 and later # -mregparm=3 works ok on gcc-3.0 and later
# #

4
include/asm-i386/module.h
View file

@ -52,8 +52,8 @@ struct mod_arch_specific
#define MODULE_PROC_FAMILY "CYRIXIII " #define MODULE_PROC_FAMILY "CYRIXIII "
#elif defined CONFIG_MVIAC3_2 #elif defined CONFIG_MVIAC3_2
#define MODULE_PROC_FAMILY "VIAC3-2 " #define MODULE_PROC_FAMILY "VIAC3-2 "
#elif CONFIG_MGEODE #elif CONFIG_MGEODEGX1
#define MODULE_PROC_FAMILY "GEODE " #define MODULE_PROC_FAMILY "GEODEGX1 "
#else #else
#error unknown processor family #error unknown processor family
#endif #endif