Patchwork socket 940 Kconfig

login
register
about
Submitter Myles Watson
Date 2009-08-24 18:01:03
Message ID <2831fecf0908241101r1e820c13kac29a5a7903dccde@mail.gmail.com>
Download mbox | patch
Permalink /patch/178/
State Accepted
Headers show

Comments

Myles Watson - 2009-08-24 18:01:03
Add support for socket 940.  Move common files from socket_F,
socket_AM2, and socket_940 into model_fxx.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Stefan Reinauer - 2009-08-25 09:17:52
On 8/24/09 8:01 PM, Myles Watson wrote:
> Add support for socket 940.  Move common files from socket_F,
> socket_AM2, and socket_940 into model_fxx.
>
> Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Thanks,
> Myles
>   
Acked-by: Stefan Reinauer <stepan@coresystems.de>
Myles Watson - 2009-08-25 14:44:58
> Acked-by: Stefan Reinauer <stepan@coresystems.de>
Rev. 4574

Thanks,
Myles
ron minnich - 2009-08-25 14:54:15
On Mon, Aug 24, 2009 at 11:01 AM, Myles Watson<mylesgw@gmail.com> wrote:
>  Move common files from socket_F,
> socket_AM2, and socket_940 into model_fxx.

This may be good for this model and set of sockets but may be a
problem in general. If some future socket includes both model_fxx, AND
includes some other model, is there any problem that may occur if the
subdirs-y for some directories are executed twice?

Remember, you are not only setting up sockets/models for one part of
one cpu family, you are setting up a pattern which others will follow.
Be very careful about that!

If there is no problem, I guess this change is ok. I'm not that
comfortable with it, however.

ron
Myles Watson - 2009-08-25 15:40:50
> >  Move common files from socket_F,
> > socket_AM2, and socket_940 into model_fxx.
> 
> This may be good for this model and set of sockets but may be a
> problem in general. If some future socket includes both model_fxx, AND
> includes some other model, is there any problem that may occur if the
> subdirs-y for some directories are executed twice?

I think it should be pushed even farther down the tree and then that
wouldn't be a problem either.  Lets say that we had a "generic Pentium+"
config, then we could source that from almost any socket, and nothing would
be included twice.  There should be no boards with two sockets, right?
 
> Remember, you are not only setting up sockets/models for one part of
> one cpu family, you are setting up a pattern which others will follow.
> Be very careful about that!
I was trying, but I've had several missteps.

> If there is no problem, I guess this change is ok. I'm not that
> comfortable with it, however.
You can revert it or tell me to.

Thanks,
Myles

Patch

Index: src/cpu/amd/Kconfig
===================================================================
--- src/cpu/amd/Kconfig	(revision 4565)
+++ src/cpu/amd/Kconfig	(working copy)
@@ -1,6 +1,6 @@ 
 #source src/cpu/amd/socket_754/Kconfig
 #source src/cpu/amd/socket_939/Kconfig
-#source src/cpu/amd/socket_940/Kconfig
+source src/cpu/amd/socket_940/Kconfig
 source src/cpu/amd/socket_AM2/Kconfig
 #source src/cpu/amd/socket_AM2r2/Kconfig
 source src/cpu/amd/socket_F/Kconfig
Index: src/cpu/amd/socket_940/Kconfig
===================================================================
--- src/cpu/amd/socket_940/Kconfig	(revision 4558)
+++ src/cpu/amd/socket_940/Kconfig	(working copy)
@@ -1,32 +1,14 @@ 
-config CPU_AMD_SOCKET_F
+config CPU_AMD_SOCKET_940
 	bool
 	default false
 
-config CPU_SOCKET_TYPE
-	hex
-	default 0x10
-	depends on CPU_AMD_SOCKET_F
-
 config K8_REV_F_SUPPORT
 	hex
-	default 1
-	depends on CPU_AMD_SOCKET_F
+	default 0
+	depends on CPU_AMD_SOCKET_940
 
 #Opteron K8 1G HT Support
 config K8_HT_FREQ_1G_SUPPORT
 	hex
 	default 1
-	depends on CPU_AMD_SOCKET_F
-
-#DDR2 and REG
-config DIMM_SUPPORT
-	hex
-	default 0x0104 
-	depends on CPU_AMD_SOCKET_F
-
-config CPU_SOCKET_TYPE
-	hex
-	default 0x10
-	depends on CPU_AMD_SOCKET_F
-
-source src/cpu/amd/model_fxx/Kconfig
+	depends on CPU_AMD_SOCKET_940

Property changes on: src/cpu/amd/socket_940/Kconfig
___________________________________________________________________
Added: svn:mergeinfo

Index: src/cpu/amd/socket_940/Makefile.inc
===================================================================
--- src/cpu/amd/socket_940/Makefile.inc	(revision 4564)
+++ src/cpu/amd/socket_940/Makefile.inc	(working copy)
@@ -1,14 +1,2 @@ 
-obj-y += socket_F.o
+obj-y += socket_940.o
 subdirs-y += ../model_fxx
-subdirs-y += ../dualcore
-subdirs-y += ../mtrr
-subdirs-y += ../../x86/tsc
-subdirs-y += ../../x86/mtrr
-subdirs-y += ../../x86/fpu
-subdirs-y += ../../x86/mmx
-subdirs-y += ../../x86/sse
-subdirs-y += ../../x86/lapic
-subdirs-y += ../../x86/cache
-subdirs-y += ../../x86/mtrr
-subdirs-y += ../../x86/pae
-subdirs-y += ../../x86/smm

Property changes on: src/cpu/amd/socket_940/Makefile.inc
___________________________________________________________________
Added: svn:mergeinfo

Index: src/cpu/amd/Makefile.inc
===================================================================
--- src/cpu/amd/Makefile.inc	(revision 4565)
+++ src/cpu/amd/Makefile.inc	(working copy)
@@ -1,2 +1,3 @@ 
 subdirs-$(CONFIG_CPU_AMD_SOCKET_F) += socket_F
+subdirs-$(CONFIG_CPU_AMD_SOCKET_940) += socket_940
 subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2) += socket_AM2
Index: src/cpu/amd/model_fxx/Makefile.inc
===================================================================
--- src/cpu/amd/model_fxx/Makefile.inc	(revision 4564)
+++ src/cpu/amd/model_fxx/Makefile.inc	(working copy)
@@ -4,3 +4,16 @@ 
 obj-y += model_fxx_update_microcode.o
 obj-y += processor_name.o
 obj-y += powernow_acpi.o
+subdirs-y += ../dualcore
+subdirs-y += ../mtrr
+subdirs-y += ../microcode
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/fpu
+subdirs-y += ../../x86/mmx
+subdirs-y += ../../x86/sse
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/pae
+subdirs-y += ../../x86/smm
Index: src/cpu/amd/socket_AM2/Makefile.inc
===================================================================
--- src/cpu/amd/socket_AM2/Makefile.inc	(revision 4565)
+++ src/cpu/amd/socket_AM2/Makefile.inc	(working copy)
@@ -1,15 +1,2 @@ 
 obj-y += socket_AM2.o
 subdirs-y += ../model_fxx
-subdirs-y += ../dualcore
-subdirs-y += ../mtrr
-subdirs-y += ../microcode
-subdirs-y += ../../x86/tsc
-subdirs-y += ../../x86/mtrr
-subdirs-y += ../../x86/fpu
-subdirs-y += ../../x86/mmx
-subdirs-y += ../../x86/sse
-subdirs-y += ../../x86/lapic
-subdirs-y += ../../x86/cache
-subdirs-y += ../../x86/mtrr
-subdirs-y += ../../x86/pae
-subdirs-y += ../../x86/smm
Index: src/cpu/amd/socket_F/Makefile.inc
===================================================================
--- src/cpu/amd/socket_F/Makefile.inc	(revision 4564)
+++ src/cpu/amd/socket_F/Makefile.inc	(working copy)
@@ -1,14 +1,2 @@ 
 obj-y += socket_F.o
 subdirs-y += ../model_fxx
-subdirs-y += ../dualcore
-subdirs-y += ../mtrr
-subdirs-y += ../../x86/tsc
-subdirs-y += ../../x86/mtrr
-subdirs-y += ../../x86/fpu
-subdirs-y += ../../x86/mmx
-subdirs-y += ../../x86/sse
-subdirs-y += ../../x86/lapic
-subdirs-y += ../../x86/cache
-subdirs-y += ../../x86/mtrr
-subdirs-y += ../../x86/pae
-subdirs-y += ../../x86/smm