Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47137419 authored by Kianusch Sayah Karadji's avatar Kianusch Sayah Karadji Committed by Linus Torvalds
Browse files

[PATCH] x86: geode support fixes 



- 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: default avatarKianusch Sayah Karadji <kianusch@sk-tech.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 02c30a84

arch/i386/Kconfig

+9 −11
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ config M386 
	  - "Winchip-C6" for original IDT Winchip.

	  - "Winchip-2" for IDT Winchip 2.

	  - "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.

	  - "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

	  operations.



config MGEODE

	bool "MediaGX/Geode"

config MGEODEGX1

	bool "GeodeGX1"

	help

	  Select this for a Cyrix MediaGX aka Geode chip. Linux and GCC

          treat this chip as a 586TSC with some extended instructions

          and alignment reqirements.

	  Select this for a Geode GX1 (Cyrix MediaGX) chip.



config MCYRIXIII

	bool "CyrixIII/VIA-C3"
@@ -368,7 +366,7 @@ config X86_L1_CACHE_SHIFT 
	int

	default "7" if MPENTIUM4 || X86_GENERIC

	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



config RWSEM_GENERIC_SPINLOCK
@@ -387,7 +385,7 @@ config GENERIC_CALIBRATE_DELAY 


config X86_PPRO_FENCE

	bool

	depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODE

	depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1

	default y



config X86_F00F_BUG
@@ -417,7 +415,7 @@ config X86_POPAD_OK 


config X86_ALIGNMENT_16

	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



config X86_GOOD_APIC
@@ -442,7 +440,7 @@ config X86_USE_3DNOW 


config X86_OOSTORE

	bool

	depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MGEODE) && MTRR

	depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR

	default y



config HPET_TIMER
@@ -578,7 +576,7 @@ config X86_VISWS_APIC 


config X86_TSC

	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



config X86_MCE

arch/i386/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
# 19990713  Artur Skawina <skawina@geocities.com>

#           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



LDFLAGS		:= -m elf_i386
@@ -54,8 +54,8 @@ cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686) 
# AMD Elan support

cflags-$(CONFIG_X86_ELAN)	+= -march=i486



# MediaGX aka Geode support

cflags-$(CONFIG_MGEODE)		+= $(call cc-option,-march=pentium-mmx,-march=i586)

# Geode GX1 support

cflags-$(CONFIG_MGEODEGX1)		+= $(call cc-option,-march=pentium-mmx,-march=i486)



# -mregparm=3 works ok on gcc-3.0 and later

#

include/asm-i386/module.h

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ struct mod_arch_specific 
#define MODULE_PROC_FAMILY "CYRIXIII "

#elif defined CONFIG_MVIAC3_2

#define MODULE_PROC_FAMILY "VIAC3-2 "

#elif CONFIG_MGEODE

#define MODULE_PROC_FAMILY "GEODE "

#elif CONFIG_MGEODEGX1

#define MODULE_PROC_FAMILY "GEODEGX1 "

#else

#error unknown processor family

#endif