From c570a0e713abbe03280b2da461106806c9366e48 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 27 Feb 2019 14:32:23 +0100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/31645 Reviewed-by: Arthur Heymans Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/cpu/intel/Kconfig | 2 +- src/cpu/intel/Makefile.inc | 2 +- src/cpu/intel/socket_mPGA478MN/Kconfig | 18 ------------------ src/cpu/intel/socket_mPGA478MN/Makefile.inc | 15 --------------- src/cpu/intel/socket_p/Kconfig | 18 ++++++++++++++++++ src/cpu/intel/socket_p/Makefile.inc | 15 +++++++++++++++ 6 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 src/cpu/intel/socket_mPGA478MN/Kconfig delete mode 100644 src/cpu/intel/socket_mPGA478MN/Makefile.inc create mode 100644 src/cpu/intel/socket_p/Kconfig create mode 100644 src/cpu/intel/socket_p/Makefile.inc (limited to 'src/cpu/intel') 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_mPGA478MN/Kconfig deleted file mode 100644 index 7d97022cc6..0000000000 --- a/src/cpu/intel/socket_mPGA478MN/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -config CPU_INTEL_SOCKET_MPGA478MN - bool - select CPU_INTEL_MODEL_1067X - select CPU_INTEL_MODEL_6FX - select MMX - select SSE - -if CPU_INTEL_SOCKET_MPGA478MN - -config DCACHE_RAM_BASE - hex - default 0xfefc0000 - -config DCACHE_RAM_SIZE - hex - default 0x8000 - -endif diff --git a/src/cpu/intel/socket_mPGA478MN/Makefile.inc b/src/cpu/intel/socket_mPGA478MN/Makefile.inc deleted file mode 100644 index 78d7c0ee58..0000000000 --- a/src/cpu/intel/socket_mPGA478MN/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -subdirs-y += ../model_6fx -subdirs-y += ../model_1067x -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 += ../hyperthreading -subdirs-y += ../speedstep - -cpu_incs-y += $(src)/cpu/intel/car/core2/cache_as_ram.S -postcar-y += ../car/p4-netburst/exit_car.S - -romstage-y += ../car/romstage.c diff --git a/src/cpu/intel/socket_p/Kconfig b/src/cpu/intel/socket_p/Kconfig new file mode 100644 index 0000000000..0ec9ced5d0 --- /dev/null +++ b/src/cpu/intel/socket_p/Kconfig @@ -0,0 +1,18 @@ +config CPU_INTEL_SOCKET_P + bool + select CPU_INTEL_MODEL_1067X + select CPU_INTEL_MODEL_6FX + select MMX + select SSE + +if CPU_INTEL_SOCKET_P + +config DCACHE_RAM_BASE + hex + default 0xfefc0000 + +config DCACHE_RAM_SIZE + hex + default 0x8000 + +endif diff --git a/src/cpu/intel/socket_p/Makefile.inc b/src/cpu/intel/socket_p/Makefile.inc new file mode 100644 index 0000000000..78d7c0ee58 --- /dev/null +++ b/src/cpu/intel/socket_p/Makefile.inc @@ -0,0 +1,15 @@ +subdirs-y += ../model_6fx +subdirs-y += ../model_1067x +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 += ../hyperthreading +subdirs-y += ../speedstep + +cpu_incs-y += $(src)/cpu/intel/car/core2/cache_as_ram.S +postcar-y += ../car/p4-netburst/exit_car.S + +romstage-y += ../car/romstage.c -- cgit v1.2.3