diff options
| author | Nico Huber <nico.huber@secunet.com> | 2019-02-27 14:32:23 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-02-28 13:48:58 +0000 |
| commit | c570a0e713abbe03280b2da461106806c9366e48 (patch) | |
| tree | 291442a0716365208aec9af007da3f8514c323cc | |
| parent | 1083a4d2324ce54f0a9f77098c8d7c23839c3849 (diff) | |
cpu/intel: Rename socket_mPGA478MN to socket_p
These marketing names are much easier to distinguish. My
mnemonic: Socket M => up to Merom, Socket P => up to Penryn.
Change-Id: I3c2a59596cf7f3cd763bd79962ad326ab080677b
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/31645
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/cpu/intel/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/intel/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/intel/socket_p/Kconfig (renamed from src/cpu/intel/socket_mPGA478MN/Kconfig) | 4 | ||||
| -rw-r--r-- | src/cpu/intel/socket_p/Makefile.inc (renamed from src/cpu/intel/socket_mPGA478MN/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t400/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/t400/devicetree.cb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig index f88e631729..10f7ad4192 100644 --- a/src/cpu/intel/Kconfig +++ b/src/cpu/intel/Kconfig @@ -21,7 +21,7 @@ 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_m/Kconfig -source src/cpu/intel/socket_mPGA478MN/Kconfig +source src/cpu/intel/socket_p/Kconfig source src/cpu/intel/socket_mPGA604/Kconfig source src/cpu/intel/socket_441/Kconfig source src/cpu/intel/socket_LGA775/Kconfig diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc index e4d3f846bc..95352629fe 100644 --- a/src/cpu/intel/Makefile.inc +++ b/src/cpu/intel/Makefile.inc @@ -9,7 +9,7 @@ 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_M) += socket_m -subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA478MN) += socket_mPGA478MN +subdirs-$(CONFIG_CPU_INTEL_SOCKET_P) += socket_p subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA604) += socket_mPGA604 subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += model_206ax diff --git a/src/cpu/intel/socket_mPGA478MN/Kconfig b/src/cpu/intel/socket_p/Kconfig index 7d97022cc6..0ec9ced5d0 100644 --- a/src/cpu/intel/socket_mPGA478MN/Kconfig +++ b/src/cpu/intel/socket_p/Kconfig @@ -1,11 +1,11 @@ -config CPU_INTEL_SOCKET_MPGA478MN +config CPU_INTEL_SOCKET_P bool select CPU_INTEL_MODEL_1067X select CPU_INTEL_MODEL_6FX select MMX select SSE -if CPU_INTEL_SOCKET_MPGA478MN +if CPU_INTEL_SOCKET_P config DCACHE_RAM_BASE hex diff --git a/src/cpu/intel/socket_mPGA478MN/Makefile.inc b/src/cpu/intel/socket_p/Makefile.inc index 78d7c0ee58..78d7c0ee58 100644 --- a/src/cpu/intel/socket_mPGA478MN/Makefile.inc +++ b/src/cpu/intel/socket_p/Makefile.inc diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index ab5818fa39..57e31f22f0 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -4,7 +4,7 @@ if BOARD_LENOVO_T400 || BOARD_LENOVO_T500 || BOARD_LENOVO_R400 \ config BOARD_SPECIFIC_OPTIONS def_bool y select SYSTEM_TYPE_LAPTOP - select CPU_INTEL_SOCKET_MPGA478MN + select CPU_INTEL_SOCKET_P select NORTHBRIDGE_INTEL_GM45 select SOUTHBRIDGE_INTEL_I82801IX select EC_LENOVO_PMH7 diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb index 4e88e276d3..8e90431d5f 100644 --- a/src/mainboard/lenovo/t400/devicetree.cb +++ b/src/mainboard/lenovo/t400/devicetree.cb @@ -6,7 +6,7 @@ chip northbridge/intel/gm45 register "gfx.use_spread_spectrum_clock" = "1" device cpu_cluster 0 on - chip cpu/intel/socket_mPGA478MN + chip cpu/intel/socket_p device lapic 0 on end end chip cpu/intel/model_1067x |