14 files changed, 20 insertions, 22 deletions
diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index 31c701cfe2..81a834c5d5 100644
--- a/src/cpu/intel/Kconfig
+++ b/src/cpu/intel/Kconfig
@@ -16,9 +16,9 @@ source src/cpu/intel/model_f3x/Kconfig
 source src/cpu/intel/model_f4x/Kconfig
 source src/cpu/intel/ep80579/Kconfig
 # Sockets/Slots
-source src/cpu/intel/bga956/Kconfig
 source src/cpu/intel/slot_2/Kconfig
 source src/cpu/intel/slot_1/Kconfig
+source src/cpu/intel/socket_BGA956/Kconfig
 source src/cpu/intel/socket_FC_PGA370/Kconfig
 source src/cpu/intel/socket_mFCBGA479/Kconfig
 source src/cpu/intel/socket_mFCPGA478/Kconfig
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index 274c101fa4..05f947dffb 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.inc
@@ -4,7 +4,7 @@
 # Therefore: ONLY include Makefile.inc from socket directories!
 
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_441) += socket_441
-subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += bga956
+subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += socket_BGA956
 subdirs-$(CONFIG_CPU_INTEL_EP80579) += ep80579
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_FC_PGA370) += socket_FC_PGA370
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCBGA479) += socket_mFCBGA479
diff --git a/src/cpu/intel/bga956/bga956.c b/src/cpu/intel/bga956/bga956.c
deleted file mode 100644
index 3469215cf3..0000000000
--- a/src/cpu/intel/bga956/bga956.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <device/device.h>
-#include "chip.h"
-
-
-struct chip_operations cpu_intel_bga956_ops = {
-	CHIP_NAME("BGA956 CPU")
-};
diff --git a/src/cpu/intel/bga956/chip.h b/src/cpu/intel/bga956/chip.h
deleted file mode 100644
index 0f32d3358c..0000000000
--- a/src/cpu/intel/bga956/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-extern struct chip_operations cpu_intel_bga956_ops;
-
-struct cpu_intel_bga956_config {
-};
diff --git a/src/cpu/intel/model_1067x/Kconfig b/src/cpu/intel/model_1067x/Kconfig
index 4ddba39c80..b079922275 100644
--- a/src/cpu/intel/model_1067x/Kconfig
+++ b/src/cpu/intel/model_1067x/Kconfig
@@ -1,4 +1,4 @@
-config CPU_INTEL_CORE2
+config CPU_INTEL_MODEL_1067X
 	bool
 	select SMP
 	select SSE2
diff --git a/src/cpu/intel/model_6ex/Kconfig b/src/cpu/intel/model_6ex/Kconfig
index 89005b818d..31d24bd68f 100644
--- a/src/cpu/intel/model_6ex/Kconfig
+++ b/src/cpu/intel/model_6ex/Kconfig
@@ -1,4 +1,4 @@
-config CPU_INTEL_CORE
+config CPU_INTEL_MODEL_6EX
 	bool
 	select SMP
 	select SSE2
diff --git a/src/cpu/intel/model_6fx/Kconfig b/src/cpu/intel/model_6fx/Kconfig
index 2551057e7b..851685cb06 100644
--- a/src/cpu/intel/model_6fx/Kconfig
+++ b/src/cpu/intel/model_6fx/Kconfig
@@ -1,4 +1,4 @@
-config CPU_INTEL_CORE2
+config CPU_INTEL_MODEL_6FX
 	bool
 	select SMP
 	select SSE2
diff --git a/src/cpu/intel/bga956/Kconfig b/src/cpu/intel/socket_BGA956/Kconfig
index e70c48b58e..a764348e90 100644
--- a/src/cpu/intel/bga956/Kconfig
+++ b/src/cpu/intel/socket_BGA956/Kconfig
@@ -1,3 +1,3 @@
 config CPU_INTEL_SOCKET_BGA956
 	bool
-	select CPU_INTEL_CORE2
+	select CPU_INTEL_MODEL_1067X
diff --git a/src/cpu/intel/bga956/Makefile.inc b/src/cpu/intel/socket_BGA956/Makefile.inc
index a0ace125b9..a290e6997a 100644
--- a/src/cpu/intel/bga956/Makefile.inc
+++ b/src/cpu/intel/socket_BGA956/Makefile.inc
@@ -1,4 +1,4 @@
-ramstage-y += bga956.c
+ramstage-y += socket_BGA956.c
 subdirs-y += ../model_1067x
 subdirs-y += ../../x86/tsc
 subdirs-y += ../../x86/mtrr
diff --git a/src/cpu/intel/socket_BGA956/chip.h b/src/cpu/intel/socket_BGA956/chip.h
new file mode 100644
index 0000000000..68ec1d2dc8
--- /dev/null
+++ b/src/cpu/intel/socket_BGA956/chip.h
@@ -0,0 +1,4 @@
+extern struct chip_operations cpu_intel_socket_BGA956_ops;
+
+struct cpu_intel_socket_BGA956_config {
+};
diff --git a/src/cpu/intel/socket_BGA956/socket_BGA956.c b/src/cpu/intel/socket_BGA956/socket_BGA956.c
new file mode 100644
index 0000000000..53667c1bce
--- /dev/null
+++ b/src/cpu/intel/socket_BGA956/socket_BGA956.c
@@ -0,0 +1,6 @@
+#include <device/device.h>
+#include "chip.h"
+
+struct chip_operations cpu_intel_socket_BGA956_ops = {
+	CHIP_NAME("Socket BGA956 CPU")
+};
diff --git a/src/cpu/intel/socket_LGA771/Kconfig b/src/cpu/intel/socket_LGA771/Kconfig
index 0821c3e246..62bd17b1fe 100644
--- a/src/cpu/intel/socket_LGA771/Kconfig
+++ b/src/cpu/intel/socket_LGA771/Kconfig
@@ -1,7 +1,6 @@
 config CPU_INTEL_SOCKET_LGA771
 	bool
         select CPU_INTEL_MODEL_6FX
-        select CPU_INTEL_CORE2
 	select SSE2
 	select MMX
 	select AP_IN_SIPI_WAIT
diff --git a/src/cpu/intel/socket_mFCPGA478/Kconfig b/src/cpu/intel/socket_mFCPGA478/Kconfig
index 3f39303065..2d241cfac4 100644
--- a/src/cpu/intel/socket_mFCPGA478/Kconfig
+++ b/src/cpu/intel/socket_mFCPGA478/Kconfig
@@ -5,8 +5,8 @@ if CPU_INTEL_SOCKET_MFCPGA478
 
 config SOCKET_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select CPU_INTEL_CORE
-	select CPU_INTEL_CORE2
+	select CPU_INTEL_MODEL_6EX
+	select CPU_INTEL_MODEL_6FX
 	select MMX
 	select SSE
 	select CACHE_AS_RAM
diff --git a/src/mainboard/intel/eagleheights/devicetree.cb b/src/mainboard/intel/eagleheights/devicetree.cb
index e628ddab7b..9971264169 100644
--- a/src/mainboard/intel/eagleheights/devicetree.cb
+++ b/src/mainboard/intel/eagleheights/devicetree.cb
@@ -65,7 +65,7 @@ chip northbridge/intel/i3100
                 end
         end
         device lapic_cluster 0 on
-                chip cpu/intel/bga956
+                chip cpu/intel/socket_BGA956
                         device lapic 0 on end
                 end
         end