cpu/intel/model_206ax: Remove the notion of sockets

With the memory controller the separate sockets becomes a useless
distinction. They all used the same code anyway.

UNTESTED: This also updates autoport.

Change-Id: I044d434a5b8fca75db9eb193c7ffc60f3c78212b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/31031
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

83 files changed, 43 insertions, 169 deletions

diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig
index 6130c3839e..9d4047dc9b 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -3,7 +3,6 @@ if BOARD_APPLE_MACBOOKAIR4_2
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select CPU_INTEL_SOCKET_RPGA989
 	select EC_ACPI
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb
index 287b8c0c72..267ecb15fd 100644
--- a/src/mainboard/apple/macbookair4_2/devicetree.cb
+++ b/src/mainboard/apple/macbookair4_2/devicetree.cb
@@ -15,9 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "2000"
 	register "gpu_pch_backlight" = "0x13121312"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -25,6 +22,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/asrock/b75pro3-m/Kconfig b/src/mainboard/asrock/b75pro3-m/Kconfig
index c0f907fae0..5fc3c5e4ba 100644
--- a/src/mainboard/asrock/b75pro3-m/Kconfig
+++ b/src/mainboard/asrock/b75pro3-m/Kconfig
@@ -18,7 +18,6 @@ if BOARD_ASROCK_B75PRO3_M
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select CPU_INTEL_SOCKET_RPGA989
 	select SUPERIO_NUVOTON_NCT6776
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb
index d209843ea0..9eba6fca82 100644
--- a/src/mainboard/asrock/b75pro3-m/devicetree.cb
+++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "0"
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/asus/maximus_iv_gene-z/Kconfig b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
index c6e0dcebda..4669cabf30 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig
+++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
@@ -19,7 +19,6 @@ if BOARD_ASUS_MAXIMUS_IV_GENE_Z
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select CPU_INTEL_SOCKET_LGA1155
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
index a3f456400c..4b80f393f6 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
+++ b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb
@@ -16,9 +16,6 @@
 
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -26,6 +23,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/asus/p8h61-m_lx/Kconfig b/src/mainboard/asus/p8h61-m_lx/Kconfig
index 0960803546..cc2f8a9979 100644
--- a/src/mainboard/asus/p8h61-m_lx/Kconfig
+++ b/src/mainboard/asus/p8h61-m_lx/Kconfig
@@ -19,7 +19,6 @@ if BOARD_ASUS_P8H61_M_LX
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_4096
-	select CPU_INTEL_SOCKET_LGA1155
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/asus/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/p8h61-m_lx/devicetree.cb
index 5a40b314ff..ef8071fabb 100644
--- a/src/mainboard/asus/p8h61-m_lx/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_lx/devicetree.cb
@@ -16,9 +16,6 @@
 
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -26,6 +23,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig
index 8fcc6509c8..4d2418703a 100644
--- a/src/mainboard/asus/p8h61-m_pro/Kconfig
+++ b/src/mainboard/asus/p8h61-m_pro/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
 	select BOARD_ROMSIZE_KB_4096
-	select CPU_INTEL_SOCKET_LGA1155
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
index fb12153757..9407aab548 100644
--- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
@@ -17,9 +17,6 @@ chip northbridge/intel/sandybridge
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	register "gfx.ndid" = "3"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -27,6 +24,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/compulab/intense_pc/Kconfig b/src/mainboard/compulab/intense_pc/Kconfig
index bc197b10d1..f321ae04c2 100644
--- a/src/mainboard/compulab/intense_pc/Kconfig
+++ b/src/mainboard/compulab/intense_pc/Kconfig
@@ -3,7 +3,6 @@ if BOARD_COMPULAB_INTENSE_PC
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select CPU_INTEL_SOCKET_FCBGA1023
 	select EC_ACPI
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb
index dfd2e69e2d..a6bcb1d7aa 100644
--- a/src/mainboard/compulab/intense_pc/devicetree.cb
+++ b/src/mainboard/compulab/intense_pc/devicetree.cb
@@ -28,9 +28,6 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_panel_power_up_delay" = "0"
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_FCBGA1023
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -38,6 +35,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index 360f7d1b3d..659f47c5b0 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -3,7 +3,6 @@ if BOARD_GIGABYTE_GA_B75M_D3H
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
-	select CPU_INTEL_SOCKET_LGA1155
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
index 2091346a17..7a3568aba3 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb
@@ -4,9 +4,6 @@ chip northbridge/intel/sandybridge
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c2_acpower" = "3"
@@ -15,6 +12,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_battery" = "5"
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
index 2c01c06874..e01d4847ef 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
@@ -3,7 +3,6 @@ if BOARD_GIGABYTE_GA_B75M_D3V
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
-	select CPU_INTEL_SOCKET_LGA1155
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
index 61c342a040..a00e2ee0c5 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb
@@ -3,9 +3,6 @@ chip northbridge/intel/sandybridge
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c2_acpower" = "3"
@@ -14,6 +11,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_battery" = "5"
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
index a4595f53bf..39a70f8896 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
 	select BOARD_ROMSIZE_KB_4096
-	select CPU_INTEL_SOCKET_LGA1155
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_INT15
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
index bca7381159..667dd9c0b3 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
@@ -17,9 +17,6 @@ chip northbridge/intel/sandybridge
 	register "gfx.ndid" = "3"
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -27,6 +24,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 37377ec178..570a1b3573 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -3,7 +3,6 @@ if BOARD_GOOGLE_BUTTERFLY
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select EC_QUANTA_ENE_KB3940Q
diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb
index b54ca9a785..d8a0ee1c31 100644
--- a/src/mainboard/google/butterfly/devicetree.cb
+++ b/src/mainboard/google/butterfly/devicetree.cb
@@ -22,11 +22,9 @@ chip northbridge/intel/sandybridge
 	register "max_mem_clock_mhz" = "666"			# DDR3-1333
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 98b256d595..fea82f6756 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -3,7 +3,6 @@ if BOARD_GOOGLE_LINK
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select BOARD_ROMSIZE_KB_8192
diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb
index c3b93f0206..1b27a69b54 100644
--- a/src/mainboard/google/link/devicetree.cb
+++ b/src/mainboard/google/link/devicetree.cb
@@ -21,11 +21,9 @@ chip northbridge/intel/sandybridge
 	register "max_mem_clock_mhz" = "666"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 3bbf5a84b6..f2c9b20a1c 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -3,7 +3,6 @@ if BOARD_GOOGLE_PARROT
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select EC_COMPAL_ENE932
diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb
index e6c8a06da7..046db97585 100644
--- a/src/mainboard/google/parrot/devicetree.cb
+++ b/src/mainboard/google/parrot/devicetree.cb
@@ -21,11 +21,9 @@ chip northbridge/intel/sandybridge
 	register "max_mem_clock_mhz" = "666"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index bfd45ea600..c9b67ccee1 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -3,7 +3,6 @@ if BOARD_GOOGLE_STOUT
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select EC_QUANTA_IT8518
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index 31407820a1..ddcf4e22d1 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -23,11 +23,9 @@ chip northbridge/intel/sandybridge
 	register "max_mem_clock_mhz" = "666"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "tcc_offset" = "5"	# TCC of 95C
diff --git a/src/mainboard/hp/2570p/Kconfig b/src/mainboard/hp/2570p/Kconfig
index 4d9d120f60..03a059821c 100644
--- a/src/mainboard/hp/2570p/Kconfig
+++ b/src/mainboard/hp/2570p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_2570P
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select CPU_INTEL_SOCKET_RPGA989
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_INT15
diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb
index e1f0cca01d..585d61d134 100644
--- a/src/mainboard/hp/2570p/devicetree.cb
+++ b/src/mainboard/hp/2570p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/hp/2760p/Kconfig b/src/mainboard/hp/2760p/Kconfig
index c698df643d..9b3f78b124 100644
--- a/src/mainboard/hp/2760p/Kconfig
+++ b/src/mainboard/hp/2760p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_2760P
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select CPU_INTEL_SOCKET_RPGA989
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_INT15
diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb
index 15f8943318..515d20f761 100644
--- a/src/mainboard/hp/2760p/devicetree.cb
+++ b/src/mainboard/hp/2760p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/hp/8460p/Kconfig b/src/mainboard/hp/8460p/Kconfig
index a86cf8fd6b..a4b0a4a6b6 100644
--- a/src/mainboard/hp/8460p/Kconfig
+++ b/src/mainboard/hp/8460p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_8460P
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select CPU_INTEL_SOCKET_RPGA989
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_INT15
diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb
index 2964cc8166..79259b4def 100644
--- a/src/mainboard/hp/8460p/devicetree.cb
+++ b/src/mainboard/hp/8460p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig
index b73aae2c9b..2dafbe2dd6 100644
--- a/src/mainboard/hp/8470p/Kconfig
+++ b/src/mainboard/hp/8470p/Kconfig
@@ -18,7 +18,6 @@ if BOARD_HP_8470P
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select CPU_INTEL_SOCKET_RPGA989
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_INT15
diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb
index cf55d888a1..2a115cc62a 100644
--- a/src/mainboard/hp/8470p/devicetree.cb
+++ b/src/mainboard/hp/8470p/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/hp/8770w/Kconfig b/src/mainboard/hp/8770w/Kconfig
index 1ab9c60eab..ad07c8ca4e 100644
--- a/src/mainboard/hp/8770w/Kconfig
+++ b/src/mainboard/hp/8770w/Kconfig
@@ -19,7 +19,6 @@ if BOARD_HP_8770W
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select CPU_INTEL_SOCKET_RPGA989
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_INT15
diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb
index eb9ae22592..7d74c940de 100644
--- a/src/mainboard/hp/8770w/devicetree.cb
+++ b/src/mainboard/hp/8770w/devicetree.cb
@@ -17,9 +17,6 @@
 
 chip northbridge/intel/sandybridge
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -27,6 +24,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
index 48132a821e..79e18a8756 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
@@ -3,7 +3,6 @@ if BOARD_HEWLETT_PACKARD_HP_COMPAQ_8200_ELITE_SFF_PC
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select CPU_INTEL_SOCKET_LGA1155
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select INTEL_INT15
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
index 9d79a08a21..95659beaf5 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
+++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb
@@ -24,9 +24,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_dp_d_hotplug" = "0"
 
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -34,6 +31,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/hp/folio_9470m/Kconfig b/src/mainboard/hp/folio_9470m/Kconfig
index 7b3642efd6..c4ae48db85 100644
--- a/src/mainboard/hp/folio_9470m/Kconfig
+++ b/src/mainboard/hp/folio_9470m/Kconfig
@@ -3,7 +3,6 @@ if BOARD_HP_FOLIO_9470M
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select CPU_INTEL_SOCKET_RPGA989
 	select EC_HP_KBC1126
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb
index fd81a0d542..5d4e5b8ea2 100644
--- a/src/mainboard/hp/folio_9470m/devicetree.cb
+++ b/src/mainboard/hp/folio_9470m/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x0d9c0d9c"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig b/src/mainboard/hp/revolve_810_g1/Kconfig
index 8562723f19..86c40bf3de 100644
--- a/src/mainboard/hp/revolve_810_g1/Kconfig
+++ b/src/mainboard/hp/revolve_810_g1/Kconfig
@@ -3,7 +3,6 @@ if BOARD_HP_REVOLVE_810_G1
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select CPU_INTEL_SOCKET_RPGA989
 	select EC_HP_KBC1126
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb
index 1ee64f4176..4d0d6395eb 100644
--- a/src/mainboard/hp/revolve_810_g1/devicetree.cb
+++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 	register "gpu_panel_power_up_delay" = "300"
 	register "gpu_pch_backlight" = "0x02880288"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge # FIXME: check gfx.ndid and gfx.did
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/intel/dcp847ske/Kconfig b/src/mainboard/intel/dcp847ske/Kconfig
index 0086bb7fbb..aafabac8cb 100644
--- a/src/mainboard/intel/dcp847ske/Kconfig
+++ b/src/mainboard/intel/dcp847ske/Kconfig
@@ -3,7 +3,6 @@ if BOARD_INTEL_DCP847SKE
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
-	select CPU_INTEL_SOCKET_RPGA989
 	select SUPERIO_NUVOTON_NCT6776
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb
index 342e1167d1..ac152d85f9 100644
--- a/src/mainboard/intel/dcp847ske/devicetree.cb
+++ b/src/mainboard/intel/dcp847ske/devicetree.cb
@@ -13,11 +13,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_dp_b_hotplug" = "0x06"
 
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_battery" = "1"
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index ba5fda70b6..eeb441ce68 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_EMERALDLAKE2
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select SUPERIO_SMSC_SIO1007
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index ebfc055eba..60072b0995 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -13,11 +13,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_dp_b_hotplug" = "0x06"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index eddca02f4f..11f1c50942 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -2,7 +2,6 @@ if BOARD_KONTRON_KTQM77
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select SUPERIO_WINBOND_W83627DHG
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index 204fbd354d..fad139a7ac 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -4,11 +4,9 @@ chip northbridge/intel/sandybridge
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig
index 326e7ca2bc..a807316bbf 100644
--- a/src/mainboard/lenovo/l520/Kconfig
+++ b/src/mainboard/lenovo/l520/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_L520
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_4096
-	select CPU_INTEL_SOCKET_RPGA989
 	select EC_LENOVO_H8
 	select EC_LENOVO_PMH7
 	select HAVE_ACPI_RESUME
diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb
index f737b181f4..48c2ea010e 100644
--- a/src/mainboard/lenovo/l520/devicetree.cb
+++ b/src/mainboard/lenovo/l520/devicetree.cb
@@ -16,9 +16,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x00000000"
 
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -26,6 +23,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig
index cad69289a1..714f13f342 100644
--- a/src/mainboard/lenovo/s230u/Kconfig
+++ b/src/mainboard/lenovo/s230u/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_S230U
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb
index 1fe1f05164..a9e8babe6e 100644
--- a/src/mainboard/lenovo/s230u/devicetree.cb
+++ b/src/mainboard/lenovo/s230u/devicetree.cb
@@ -15,9 +15,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "600"
 	register "gpu_pch_backlight" = "0x041e041e"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -25,6 +22,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index 78e8cc2e90..e89703c29a 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_T420
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA988B
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb
index a69bb7e9dc..47c14ef909 100644
--- a/src/mainboard/lenovo/t420/devicetree.cb
+++ b/src/mainboard/lenovo/t420/devicetree.cb
@@ -19,11 +19,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x06100610"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA988B
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 114cdf1d52..12e1a5778c 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_T420S
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA988B
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb
index 9f557b4c8b..0f09db8fa9 100644
--- a/src/mainboard/lenovo/t420s/devicetree.cb
+++ b/src/mainboard/lenovo/t420s/devicetree.cb
@@ -18,11 +18,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x06100610"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA988B
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index 5a7d64abb3..743a994830 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_THINKPAD_T430
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_12288
-	select CPU_INTEL_SOCKET_RPGA989
 	select DRIVERS_RICOH_RCE822
 	select EC_LENOVO_H8
 	select EC_LENOVO_PMH7
diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb
index 72425f8249..9e731f9fbd 100644
--- a/src/mainboard/lenovo/t430/devicetree.cb
+++ b/src/mainboard/lenovo/t430/devicetree.cb
@@ -18,9 +18,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x11551155"
 
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -28,6 +25,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index edaf296192..c66c7047c8 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_T430S || BOARD_LENOVO_T431S
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb
index 10c6e4adfc..2ecf05ee43 100644
--- a/src/mainboard/lenovo/t430s/devicetree.cb
+++ b/src/mainboard/lenovo/t430s/devicetree.cb
@@ -18,11 +18,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x11551155"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 1f05e74e1b..09950da25f 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -1,7 +1,6 @@
 config BOARD_LENOVO_BASEBOARD_T520
 	def_bool n
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA988B
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
index 553c14dec3..cf8e7ce1d2 100644
--- a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb
@@ -19,11 +19,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x06100610"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA988B
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
index 1c41b56870..1770ad9722 100644
--- a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
+++ b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb
@@ -19,11 +19,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x06100610"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA988B
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index bfa186f383..d30c8950fe 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -1,7 +1,6 @@
 config BOARD_LENOVO_BASEBOARD_T530
 	def_bool n
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
index 4114b3848c..1a1e7075f2 100644
--- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb
@@ -19,11 +19,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x11551155"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
index 85add34496..253096c316 100644
--- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
+++ b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb
@@ -22,9 +22,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x11551155"
 
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax # FIXME: check all registers
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -32,6 +29,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end
diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig
index 2a580208e6..f52978fe3b 100644
--- a/src/mainboard/lenovo/x131e/Kconfig
+++ b/src/mainboard/lenovo/x131e/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_X131E
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb
index ccdff7c6dd..589c6c9fb9 100644
--- a/src/mainboard/lenovo/x131e/devicetree.cb
+++ b/src/mainboard/lenovo/x131e/devicetree.cb
@@ -18,11 +18,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x11551155"
 
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index c239050498..45e0587651 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_X1_CARBON_GEN1
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
index 75c49ad1f3..8caa0d1a2f 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
+++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb
@@ -16,11 +16,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x11551155"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index f8f7055de8..13365cba3a 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_X220 || BOARD_LENOVO_X220I || BOARD_LENOVO_X1
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select EC_LENOVO_PMH7
diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb
index 74d969f80d..0ec66f59b8 100644
--- a/src/mainboard/lenovo/x220/devicetree.cb
+++ b/src/mainboard/lenovo/x220/devicetree.cb
@@ -19,11 +19,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x06100610"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index 428f82a1e1..2891bf01bf 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -3,7 +3,6 @@ if BOARD_LENOVO_X230
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb
index cab0368565..68e2f8ea2c 100644
--- a/src/mainboard/lenovo/x230/devicetree.cb
+++ b/src/mainboard/lenovo/x230/devicetree.cb
@@ -19,11 +19,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x11551155"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig
index 33994c3f1b..71072b6bb1 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -3,7 +3,6 @@ if BOARD_RODA_RV11 || BOARD_RODA_RW11
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
 	select BOARD_ROMSIZE_KB_16384
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index d4a37c1cf7..1dfa02d317 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -31,11 +31,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x002e0000"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index d7abde8557..f1016210e6 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -31,11 +31,9 @@ chip northbridge/intel/sandybridge
 	register "gpu_pch_backlight" = "0x13120000"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 336897bb42..68aeabd041 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -7,7 +7,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
-	select CPU_INTEL_SOCKET_RPGA989
 	select EC_SMSC_MEC1308
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index ee8df2a494..719947310b 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -21,11 +21,9 @@ chip northbridge/intel/sandybridge
 	register "max_mem_clock_mhz" = "666"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_acpower" = "1"	# ACPI(C1) = MWAIT(C1)
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 2fca957705..36e28ffc6c 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -6,7 +6,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
-	select CPU_INTEL_SOCKET_RPGA989
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index 43a014fe75..192e63d4d9 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -15,11 +15,9 @@ chip northbridge/intel/sandybridge
 	register "max_mem_clock_mhz" = "666"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_rPGA989
-			device lapic 0 on end
-		end
 		chip cpu/intel/model_206ax
 			# Magic APIC ID to locate this chip
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 
 			register "c1_battery" = "3"	# ACPI(C1) = MWAIT(C3)
diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig
index a07617e70a..85b2f36cda 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -3,7 +3,6 @@ if BOARD_SAPPHIRE_PUREPLATINUMH61
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
-	select CPU_INTEL_SOCKET_LGA1155
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
index f8cd3b2118..95c59dfca3 100644
--- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
+++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb
@@ -31,9 +31,6 @@ chip northbridge/intel/sandybridge
 	register "gpu_panel_power_up_delay" = "0"
 	register "gpu_pch_backlight" = "0x00000000"
 	device cpu_cluster 0x0 on
-		chip cpu/intel/socket_LGA1155
-			device lapic 0x0 on end
-		end
 		chip cpu/intel/model_206ax
 			register "c1_acpower" = "1"
 			register "c1_battery" = "1"
@@ -41,6 +38,7 @@ chip northbridge/intel/sandybridge
 			register "c2_battery" = "3"
 			register "c3_acpower" = "5"
 			register "c3_battery" = "5"
+			device lapic 0x0 on end
 			device lapic 0xacac off end
 		end
 	end