cpu/intel: Rename socket_mFCPGA478 to socket_m

The name was wrong. mFCPGA478 is actually a pseudonym for mPGA478MN,
the successor of the socket that was meant.

The official name of this socket is mPGA478MT. But "Socket M" is much
easier to distinguish.

Change-Id: I4efeaca69acddfcdc5e957b0b521544314d46eeb
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/31642
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>

21 files changed, 22 insertions, 22 deletions

diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index 4fd8efbbcf..bdf5b5469d 100644
--- a/src/cpu/intel/Kconfig
+++ b/src/cpu/intel/Kconfig
@@ -22,7 +22,7 @@ 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_mFCPGA478/Kconfig
+source src/cpu/intel/socket_m/Kconfig
 source src/cpu/intel/socket_mPGA478MN/Kconfig
 source src/cpu/intel/socket_mPGA604/Kconfig
 source src/cpu/intel/socket_441/Kconfig
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index 3ed32971f6..e4d3f846bc 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.inc
@@ -8,7 +8,7 @@ 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_MFCPGA478) += socket_mFCPGA478
+subdirs-$(CONFIG_CPU_INTEL_SOCKET_M) += socket_m
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA478MN) += socket_mPGA478MN
 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA604) += socket_mPGA604
 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x
diff --git a/src/cpu/intel/socket_mFCPGA478/Kconfig b/src/cpu/intel/socket_m/Kconfig
index 503ad64172..aadc9a47b0 100644
--- a/src/cpu/intel/socket_mFCPGA478/Kconfig
+++ b/src/cpu/intel/socket_m/Kconfig
@@ -1,7 +1,7 @@
-config CPU_INTEL_SOCKET_MFCPGA478
+config CPU_INTEL_SOCKET_M
 	bool
 
-if CPU_INTEL_SOCKET_MFCPGA478
+if CPU_INTEL_SOCKET_M
 
 config SOCKET_SPECIFIC_OPTIONS # dummy
 	def_bool y
diff --git a/src/cpu/intel/socket_mFCPGA478/Makefile.inc b/src/cpu/intel/socket_m/Makefile.inc
index 139b1bb624..139b1bb624 100644
--- a/src/cpu/intel/socket_mFCPGA478/Makefile.inc
+++ b/src/cpu/intel/socket_m/Makefile.inc
diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig
index d60130b547..6535f8f7e5 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -4,7 +4,7 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
 	select ARCH_X86
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb
index 898aae437b..9da3891a72 100644
--- a/src/mainboard/apple/macbook21/devicetree.cb
+++ b/src/mainboard/apple/macbook21/devicetree.cb
@@ -30,7 +30,7 @@ chip northbridge/intel/i945
 	register "gpu_panel_power_cycle_delay" = "2"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mFCPGA478
+		chip cpu/intel/socket_m
 			device lapic 0 on end
 		end
 	end
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index 7a6b996314..a5eed1a659 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -17,7 +17,7 @@ if BOARD_GETAC_P470
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb
index a81ef3ac09..c0cad6a387 100644
--- a/src/mainboard/getac/p470/devicetree.cb
+++ b/src/mainboard/getac/p470/devicetree.cb
@@ -20,7 +20,7 @@ chip northbridge/intel/i945
 	register "gfx.did" = "{ 0x80000100, 0x80000410, 0x80000320, 0x80000410, 0x00000005 }"
 
         device cpu_cluster 0 on
-                chip cpu/intel/socket_mFCPGA478
+                chip cpu/intel/socket_m
                         device lapic 0 on end
                 end
         end
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index ba510fada8..621395daac 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -2,7 +2,7 @@ if BOARD_IBASE_MB899
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select CHECK_SLFRCS_ON_RESUME
diff --git a/src/mainboard/ibase/mb899/devicetree.cb b/src/mainboard/ibase/mb899/devicetree.cb
index 3544c96739..f81a68b711 100644
--- a/src/mainboard/ibase/mb899/devicetree.cb
+++ b/src/mainboard/ibase/mb899/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i945
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mFCPGA478
+		chip cpu/intel/socket_m
 			device lapic 0 on end
 		end
 	end
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 4b9f5268ef..43bdf14501 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -2,7 +2,7 @@ if BOARD_KONTRON_986LCD_M
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select CHECK_SLFRCS_ON_RESUME
diff --git a/src/mainboard/kontron/986lcd-m/devicetree.cb b/src/mainboard/kontron/986lcd-m/devicetree.cb
index 06f29e09f6..5e00109ebb 100644
--- a/src/mainboard/kontron/986lcd-m/devicetree.cb
+++ b/src/mainboard/kontron/986lcd-m/devicetree.cb
@@ -4,7 +4,7 @@ chip northbridge/intel/i945
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mFCPGA478
+		chip cpu/intel/socket_m
 			device lapic 0 on end
 		end
 	end
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index bb435570eb..a6a88b37d3 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LENOVO_T60
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index 7b1721e563..b4c8fb8b4f 100644
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -30,7 +30,7 @@ chip northbridge/intel/i945
 	register "gpu_panel_power_cycle_delay" = "2"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mFCPGA478
+		chip cpu/intel/socket_m
 			device lapic 0 on end
 		end
 	end
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index 36fbe6c254..6db7f11259 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LENOVO_X60
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index 2a60b87b87..87cfa849ee 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -30,7 +30,7 @@ chip northbridge/intel/i945
 	register "gpu_panel_power_cycle_delay" = "2"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mFCPGA478
+		chip cpu/intel/socket_m
 			device lapic 0 on end
 		end
 	end
diff --git a/src/mainboard/lenovo/z61t/Kconfig b/src/mainboard/lenovo/z61t/Kconfig
index 9aa6350f4e..a22307712b 100644
--- a/src/mainboard/lenovo/z61t/Kconfig
+++ b/src/mainboard/lenovo/z61t/Kconfig
@@ -3,7 +3,7 @@ if BOARD_LENOVO_Z61T
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/lenovo/z61t/devicetree.cb b/src/mainboard/lenovo/z61t/devicetree.cb
index 92bf3cec85..8519b31035 100644
--- a/src/mainboard/lenovo/z61t/devicetree.cb
+++ b/src/mainboard/lenovo/z61t/devicetree.cb
@@ -30,7 +30,7 @@ chip northbridge/intel/i945
 	register "gpu_panel_power_cycle_delay" = "2"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mFCPGA478
+		chip cpu/intel/socket_m
 			device lapic 0 on end
 		end
 	end
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 9f4af85ab0..821a9a1b6a 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -3,7 +3,7 @@ if BOARD_RODA_RK886EX
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select CPU_INTEL_SOCKET_MFCPGA478
+	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb
index ec4276619e..082a9e894c 100644
--- a/src/mainboard/roda/rk886ex/devicetree.cb
+++ b/src/mainboard/roda/rk886ex/devicetree.cb
@@ -20,7 +20,7 @@ chip northbridge/intel/i945
 	register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }"
 
 	device cpu_cluster 0 on
-		chip cpu/intel/socket_mFCPGA478
+		chip cpu/intel/socket_m
 			device lapic 0 on end
 		end
 	end
diff --git a/util/docker/coreboot.org-status/board-status.html/tohtml.sh b/util/docker/coreboot.org-status/board-status.html/tohtml.sh
index f786c33109..1992826667 100755
--- a/util/docker/coreboot.org-status/board-status.html/tohtml.sh
+++ b/util/docker/coreboot.org-status/board-status.html/tohtml.sh
@@ -323,9 +323,9 @@ EOF
 			INTEL_SOCKET_MPGA604)
 				cpu_nice="Intel® Xeon®";
 				socket_nice="Socket 604";;
-			INTEL_SOCKET_MFCPGA478)
+			INTEL_SOCKET_M)
 				cpu_nice="Intel® Core™ 2 Duo Mobile, Core™ Duo/Solo, Celeron® M";
-				socket_nice="Socket mPGA478";;
+				socket_nice="Socket M (mPGA478MT)";;
 			INTEL_SOCKET_LGA771)
 				cpu_nice="Intel Xeon™ 5000 series";
 				socket_nice="Socket LGA771";;