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

Commit ce9c99af authored by Ian Campbell's avatar Ian Campbell Committed by H. Peter Anvin
Browse files

x86, cpu: Move AMD Elan Kconfig under "Processor family" 



Currently the option resides under X86_EXTENDED_PLATFORM due to historical
nonstandard A20M# handling. However that is no longer the case and so Elan can
be treated as part of the standard processor choice Kconfig option.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Link: http://lkml.kernel.org/r/1302245177.31620.47.camel@localhost.localdomain


Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 6221f222

arch/x86/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -365,17 +365,6 @@ config X86_UV 
# Following is an alphabetically sorted list of 32 bit extended platforms

# Please maintain the alphabetic order if and when there are additions



config X86_ELAN

	bool "AMD Elan"

	depends on X86_32

	depends on X86_EXTENDED_PLATFORM

	---help---

	  Select this for an AMD Elan processor.



	  Do not use this option for K6/Athlon/Opteron processors!



	  If unsure, choose "PC-compatible" instead.



config X86_INTEL_CE

	bool "CE4100 TV platform"

	depends on PCI

arch/x86/Kconfig.cpu

+10 −6
Original line number Diff line number Diff line 
# Put here option for CPU selection and depending optimization

if !X86_ELAN



choice

	prompt "Processor family"

	default M686 if X86_32
@@ -203,6 +201,14 @@ config MWINCHIP3D 
	  stores for this CPU, which can increase performance of some

	  operations.



config MELAN

	bool "AMD Elan"

	depends on X86_32

	---help---

	  Select this for an AMD Elan processor.



	  Do not use this option for K6/Athlon/Opteron processors!



config MGEODEGX1

	bool "GeodeGX1"

	depends on X86_32
@@ -292,8 +298,6 @@ config X86_GENERIC 
	  This is really intended for distributors who need more

	  generic optimizations.



endif



#

# Define implied options from the CPU selection here

config X86_INTERNODE_CACHE_SHIFT
@@ -312,7 +316,7 @@ config X86_L1_CACHE_SHIFT 
	int

	default "7" if MPENTIUM4 || MPSC

	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU

	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1

	default "4" if MELAN || M486 || M386 || MGEODEGX1

	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX



config X86_XADD
@@ -358,7 +362,7 @@ config X86_POPAD_OK 


config X86_ALIGNMENT_16

	def_bool y

	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1

	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1



config X86_INTEL_USERCOPY

	def_bool y

arch/x86/Makefile_32.cpu

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom,$(call cc-option,-march= 
	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))



# AMD Elan support

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

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



# Geode GX1 support

cflags-$(CONFIG_MGEODEGX1)	+= -march=pentium-mmx

arch/x86/include/asm/module.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define MODULE_PROC_FAMILY "K7 "

#elif defined CONFIG_MK8

#define MODULE_PROC_FAMILY "K8 "

#elif defined CONFIG_X86_ELAN

#elif defined CONFIG_MELAN

#define MODULE_PROC_FAMILY "ELAN "

#elif defined CONFIG_MCRUSOE

#define MODULE_PROC_FAMILY "CRUSOE "

arch/x86/kernel/cpu/cpufreq/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ config X86_ACPI_CPUFREQ 
config ELAN_CPUFREQ

	tristate "AMD Elan SC400 and SC410"

	select CPU_FREQ_TABLE

	depends on X86_ELAN

	depends on MELAN

	---help---

	  This adds the CPUFreq driver for AMD Elan SC400 and SC410

	  processors.
@@ -59,7 +59,7 @@ config ELAN_CPUFREQ 
config SC520_CPUFREQ

	tristate "AMD Elan SC520"

	select CPU_FREQ_TABLE

	depends on X86_ELAN

	depends on MELAN

	---help---

	  This adds the CPUFreq driver for AMD Elan SC520 processor.