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>

10 files changed, 9 insertions, 60 deletions

diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index 18f73b45d1..1a1bef0c26 100644
--- a/src/cpu/intel/Kconfig
+++ b/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
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index 04238ba300..76f749196d 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/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
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index cb09d23750..7f73da9ab4 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/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
diff --git a/src/cpu/intel/model_206ax/Makefile.inc b/src/cpu/intel/model_206ax/Makefile.inc
index 2c1d961deb..d193e60a4c 100644
--- a/src/cpu/intel/model_206ax/Makefile.inc
+++ b/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
diff --git a/src/cpu/intel/socket_FCBGA1023/Kconfig b/src/cpu/intel/socket_FCBGA1023/Kconfig
deleted file mode 100644
index bdac1dbd04..0000000000
--- a/src/cpu/intel/socket_FCBGA1023/Kconfig
+++ /dev/null
@@ -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
diff --git a/src/cpu/intel/socket_FCBGA1023/Makefile.inc b/src/cpu/intel/socket_FCBGA1023/Makefile.inc
deleted file mode 100644
index 539f285d92..0000000000
--- a/src/cpu/intel/socket_FCBGA1023/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/cpu/intel/socket_LGA1155/Kconfig b/src/cpu/intel/socket_LGA1155/Kconfig
deleted file mode 100644
index 35aac3c48e..0000000000
--- a/src/cpu/intel/socket_LGA1155/Kconfig
+++ /dev/null
@@ -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
diff --git a/src/cpu/intel/socket_LGA1155/Makefile.inc b/src/cpu/intel/socket_LGA1155/Makefile.inc
deleted file mode 100644
index 539f285d92..0000000000
--- a/src/cpu/intel/socket_LGA1155/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/cpu/intel/socket_rPGA988B/Kconfig b/src/cpu/intel/socket_rPGA988B/Kconfig
deleted file mode 100644
index 753cfb30c9..0000000000
--- a/src/cpu/intel/socket_rPGA988B/Kconfig
+++ /dev/null
@@ -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
diff --git a/src/cpu/intel/socket_rPGA988B/Makefile.inc b/src/cpu/intel/socket_rPGA988B/Makefile.inc
deleted file mode 100644
index 539f285d92..0000000000
--- a/src/cpu/intel/socket_rPGA988B/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