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>

src/cpu/intel/Kconfig

@@ -22,14 +22,11 @@ source src/cpu/intel/slot_1/Kconfig
 source src/cpu/intel/socket_BGA956/Kconfig
 source src/cpu/intel/socket_BGA1284/Kconfig
 source src/cpu/intel/socket_FCBGA559/Kconfig
-source src/cpu/intel/socket_FCBGA1023/Kconfig
 source src/cpu/intel/socket_mFCPGA478/Kconfig
 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_LGA1155/Kconfig
 source src/cpu/intel/socket_LGA775/Kconfig
-source src/cpu/intel/socket_rPGA988B/Kconfig
 source src/cpu/intel/socket_rPGA989/Kconfig
 # Architecture specific features
 source src/cpu/intel/fit/Kconfig

src/cpu/intel/Makefile.inc

@@ -8,11 +8,9 @@ subdirs-$(CONFIG_CPU_INTEL_SOCKET_441) += socket_441
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA956) += socket_BGA956
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_BGA1284) += socket_BGA1284
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_FCBGA559) += socket_FCBGA559
-subdirs-$(CONFIG_CPU_INTEL_SOCKET_FCBGA1023) += socket_FCBGA1023
 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_RPGA988B) += socket_rPGA988B
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_RPGA989) += socket_rPGA989
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += model_206ax
@@ -20,5 +18,4 @@ subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += model_206ax
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_HASWELL) += haswell
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY) += fsp_model_406dx
 subdirs-$(CONFIG_CPU_INTEL_SLOT_1) += slot_1
-subdirs-$(CONFIG_CPU_INTEL_SOCKET_LGA1155) += socket_LGA1155
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_LGA775) += socket_LGA775

src/cpu/intel/model_206ax/Kconfig

@@ -13,6 +13,7 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
 	select SMP
+	select MMX
 	select SSE2
 	select UDELAY_TSC
 	select TSC_CONSTANT_RATE

src/cpu/intel/model_206ax/Makefile.inc

@@ -3,6 +3,14 @@ subdirs-y += ../../x86/name
 subdirs-y += ../smm/gen1
 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
 
 ramstage-y += common.c

src/cpu/intel/socket_FCBGA1023/Kconfig

@@ -1,11 +0,0 @@
-config CPU_INTEL_SOCKET_FCBGA1023
-	bool
-
-if CPU_INTEL_SOCKET_FCBGA1023
-
-config SOCKET_SPECIFIC_OPTIONS # dummy
-	def_bool y
-	select MMX
-	select SSE2
-
-endif

src/cpu/intel/socket_FCBGA1023/Makefile.inc

@@ -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

src/cpu/intel/socket_LGA1155/Kconfig

@@ -1,11 +0,0 @@
-config CPU_INTEL_SOCKET_LGA1155
-	bool
-
-if CPU_INTEL_SOCKET_LGA1155
-
-config SOCKET_SPECIFIC_OPTIONS # dummy
-	def_bool y
-	select MMX
-	select SSE
-
-endif # CPU_INTEL_SOCKET_LGA1155

src/cpu/intel/socket_LGA1155/Makefile.inc

@@ -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

src/cpu/intel/socket_rPGA988B/Kconfig

@@ -1,11 +0,0 @@
-config CPU_INTEL_SOCKET_RPGA988B
-	bool
-
-if CPU_INTEL_SOCKET_RPGA988B
-
-config SOCKET_SPECIFIC_OPTIONS # dummy
-	def_bool y
-	select MMX
-	select SSE
-
-endif

src/cpu/intel/socket_rPGA988B/Makefile.inc

@@ -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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)

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

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)

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

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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"

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

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)

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

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)

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

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

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

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

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

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)

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

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)

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

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

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

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)

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

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)

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)

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

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)

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

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

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"

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

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)

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

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)

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

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)

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

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)

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)

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

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)

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

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)

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

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

util/autoport/sandybridge.go

@@ -62,16 +62,6 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
 				Chip: "cpu_cluster",
 				Dev:  0,
 				Children: []DevTreeNode{
-					{
-						Chip: "cpu/intel/socket_rPGA989",
-						Children: []DevTreeNode{
-							{
-								Chip: "lapic",
-								Dev:  0,
-							},
-						},
-					},
-
 					{
 						Chip:    "cpu/intel/model_206ax",
 						Comment: "FIXME: check all registers",
@@ -85,6 +75,10 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
 							"c3_battery": "5",
 						},
 						Children: []DevTreeNode{
+							{
+								Chip: "lapic",
+								Dev:  0,
+							},
 							{
 								Chip:     "lapic",
 								Dev:      0xacac,
@@ -114,7 +108,6 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
 	/* FIXME:XX some configs are unsupported.  */
 	KconfigBool["SANDYBRIDGE_IVYBRIDGE_LVDS"] = true
 
-	KconfigBool["CPU_INTEL_SOCKET_RPGA989"] = true
 	KconfigBool["NORTHBRIDGE_INTEL_"+i.variant+"BRIDGE"] = true
 	KconfigBool["USE_NATIVE_RAMINIT"] = true
 	KconfigBool["INTEL_INT15"] = true