12 files changed, 12 insertions, 32 deletions
diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index 1a1bef0c26..4fd8efbbcf 100644
--- a/src/cpu/intel/Kconfig
+++ b/src/cpu/intel/Kconfig
@@ -27,7 +27,6 @@ source src/cpu/intel/socket_mPGA478MN/Kconfig
 source src/cpu/intel/socket_mPGA604/Kconfig
 source src/cpu/intel/socket_441/Kconfig
 source src/cpu/intel/socket_LGA775/Kconfig
-source src/cpu/intel/socket_rPGA989/Kconfig
 # Architecture specific features
 source src/cpu/intel/fit/Kconfig
 source src/cpu/intel/turbo/Kconfig
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index 76f749196d..3ed32971f6 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.inc
@@ -11,7 +11,6 @@ subdirs-$(CONFIG_CPU_INTEL_SOCKET_FCBGA559) += socket_FCBGA559
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCPGA478) += socket_mFCPGA478
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA478MN) += socket_mPGA478MN
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA604) += socket_mPGA604
-subdirs-$(CONFIG_CPU_INTEL_SOCKET_RPGA989) += socket_rPGA989
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += model_206ax
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += model_206ax
diff --git a/src/cpu/intel/fsp_model_406dx/Kconfig b/src/cpu/intel/fsp_model_406dx/Kconfig
index 79658f9817..f40842fce8 100644
--- a/src/cpu/intel/fsp_model_406dx/Kconfig
+++ b/src/cpu/intel/fsp_model_406dx/Kconfig
@@ -26,6 +26,7 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
 	select SMP
+	select MMX
 	select SSE2
 	select UDELAY_LAPIC
 	select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/fsp_model_406dx/Makefile.inc b/src/cpu/intel/fsp_model_406dx/Makefile.inc
index 26f46337e0..97bb981a66 100644
--- a/src/cpu/intel/fsp_model_406dx/Makefile.inc
+++ b/src/cpu/intel/fsp_model_406dx/Makefile.inc
@@ -17,6 +17,14 @@ ramstage-y += model_406dx_init.c
 subdirs-y += ../../x86/name
 subdirs-y += ../common
 
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/smm
+subdirs-y += ../microcode
+subdirs-y += ../turbo
+
 ramstage-y += acpi.c
 
 CPPFLAGS_romstage += -I$(src)/cpu/intel/fsp_model_406dx
diff --git a/src/cpu/intel/socket_rPGA989/Kconfig b/src/cpu/intel/socket_rPGA989/Kconfig
deleted file mode 100644
index 1d1f64fdbd..0000000000
--- a/src/cpu/intel/socket_rPGA989/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-config CPU_INTEL_SOCKET_RPGA989
-	bool
-
-if CPU_INTEL_SOCKET_RPGA989
-
-config SOCKET_SPECIFIC_OPTIONS # dummy
-	def_bool y
-	select MMX
-	select SSE
-
-endif
diff --git a/src/cpu/intel/socket_rPGA989/Makefile.inc b/src/cpu/intel/socket_rPGA989/Makefile.inc
deleted file mode 100644
index 539f285d92..0000000000
--- a/src/cpu/intel/socket_rPGA989/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-subdirs-y += ../../x86/tsc
-subdirs-y += ../../x86/mtrr
-subdirs-y += ../../x86/lapic
-subdirs-y += ../../x86/cache
-subdirs-y += ../../x86/smm
-subdirs-y += ../microcode
-subdirs-y += ../turbo
diff --git a/src/mainboard/adi/rcc-dff/Kconfig b/src/mainboard/adi/rcc-dff/Kconfig
index f87535cd8a..e7be77c0ec 100644
--- a/src/mainboard/adi/rcc-dff/Kconfig
+++ b/src/mainboard/adi/rcc-dff/Kconfig
@@ -17,7 +17,6 @@ if BOARD_ADI_RCC_DFF
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_FSP_RANGELEY
 	select SOUTHBRIDGE_INTEL_FSP_RANGELEY
 	select BOARD_ROMSIZE_KB_2048 #actual chip is 8MB
diff --git a/src/mainboard/adi/rcc-dff/devicetree.cb b/src/mainboard/adi/rcc-dff/devicetree.cb
index 1df54d395c..0cb73f8a02 100644
--- a/src/mainboard/adi/rcc-dff/devicetree.cb
+++ b/src/mainboard/adi/rcc-dff/devicetree.cb
@@ -15,10 +15,8 @@
 chip northbridge/intel/fsp_rangeley
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/fsp_model_406dx
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end
 
diff --git a/src/mainboard/intel/littleplains/Kconfig b/src/mainboard/intel/littleplains/Kconfig
index 70b9580306..b5a57b798b 100644
--- a/src/mainboard/intel/littleplains/Kconfig
+++ b/src/mainboard/intel/littleplains/Kconfig
@@ -17,7 +17,6 @@ if BOARD_INTEL_LITTLEPLAINS
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_FSP_RANGELEY
 	select SOUTHBRIDGE_INTEL_FSP_RANGELEY
 	select BOARD_ROMSIZE_KB_8192
diff --git a/src/mainboard/intel/littleplains/devicetree.cb b/src/mainboard/intel/littleplains/devicetree.cb
index 1df54d395c..0cb73f8a02 100644
--- a/src/mainboard/intel/littleplains/devicetree.cb
+++ b/src/mainboard/intel/littleplains/devicetree.cb
@@ -15,10 +15,8 @@
 chip northbridge/intel/fsp_rangeley
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/fsp_model_406dx
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end
 
diff --git a/src/mainboard/intel/mohonpeak/Kconfig b/src/mainboard/intel/mohonpeak/Kconfig
index dc9dc84fd0..de91ca4835 100644
--- a/src/mainboard/intel/mohonpeak/Kconfig
+++ b/src/mainboard/intel/mohonpeak/Kconfig
@@ -17,7 +17,6 @@ if BOARD_INTEL_MOHONPEAK
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_FSP_RANGELEY
 	select SOUTHBRIDGE_INTEL_FSP_RANGELEY
 	select BOARD_ROMSIZE_KB_2048 #actual chip is 8MB
diff --git a/src/mainboard/intel/mohonpeak/devicetree.cb b/src/mainboard/intel/mohonpeak/devicetree.cb
index 1df54d395c..0cb73f8a02 100644
--- a/src/mainboard/intel/mohonpeak/devicetree.cb
+++ b/src/mainboard/intel/mohonpeak/devicetree.cb
@@ -15,10 +15,8 @@
 chip northbridge/intel/fsp_rangeley
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/fsp_model_406dx
+			device lapic 0 on end
 			# Magic APIC ID to locate this chip
 			device lapic 0xACAC off end