From patchwork Tue Aug 25 15:56:41 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Revert socket abstraction change
Date: Tue, 25 Aug 2009 15:56:41 -0000
From: Myles Watson <mylesgw@gmail.com>
X-Patchwork-Id: 187
Message-Id: <2831fecf0908250856o186e3b94jc74c4e88598de4d0@mail.gmail.com>
To: coreboot <coreboot@coreboot.org>, ron minnich <rminnich@gmail.com>

I agree that it's dangerous because it's not abstracted correctly yet.
 I'm not sure what the right fix is, but I don't think there should be
this much duplication in every socket Makefile.inc.

Maybe the best thing would be for someone to take a socket that
supports two families and implement it for Kconfig so that we can see
what shakes out.

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

Thanks,
Myles
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


Index: src/cpu/amd/socket_940/Makefile.inc
===================================================================
--- src/cpu/amd/socket_940/Makefile.inc	(revision 4577)
+++ src/cpu/amd/socket_940/Makefile.inc	(working copy)
@@ -1,2 +1,13 @@
 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
Index: src/cpu/amd/model_fxx/Makefile.inc
===================================================================
--- src/cpu/amd/model_fxx/Makefile.inc	(revision 4577)
+++ src/cpu/amd/model_fxx/Makefile.inc	(working copy)
@@ -4,16 +4,3 @@
 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 4577)
+++ src/cpu/amd/socket_AM2/Makefile.inc	(working copy)
@@ -1,2 +1,15 @@
 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 4577)
+++ src/cpu/amd/socket_F/Makefile.inc	(working copy)
@@ -1,2 +1,14 @@
 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