From 3ab6157edec3a97945cae93320da809c243843b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 29 May 2021 21:54:26 +0300 Subject: [PATCH] cpu/intel/hyperthreading: Build only for selected models MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implements intel_sibling_init() that is mostly superseded. Change-Id: I4956493d8c0c6b922343e060d2d2bd0ec20f5bb6 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/55201 Reviewed-by: Angel Pons Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/cpu/intel/model_f2x/Makefile.inc | 1 + src/cpu/intel/model_f3x/Makefile.inc | 3 +++ src/cpu/intel/socket_441/Makefile.inc | 1 - src/cpu/intel/socket_BGA956/Makefile.inc | 1 - src/cpu/intel/socket_FCBGA559/Makefile.inc | 1 - src/cpu/intel/socket_LGA775/Makefile.inc | 1 - src/cpu/intel/socket_m/Makefile.inc | 1 - src/cpu/intel/socket_mPGA604/Makefile.inc | 1 - src/cpu/intel/socket_p/Makefile.inc | 1 - 9 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/cpu/intel/model_f2x/Makefile.inc b/src/cpu/intel/model_f2x/Makefile.inc index 5d60d21eda..fa1b51ad65 100644 --- a/src/cpu/intel/model_f2x/Makefile.inc +++ b/src/cpu/intel/model_f2x/Makefile.inc @@ -1,4 +1,5 @@ subdirs-y += ../common +subdirs-y += ../hyperthreading ramstage-y += model_f2x_init.c diff --git a/src/cpu/intel/model_f3x/Makefile.inc b/src/cpu/intel/model_f3x/Makefile.inc index 1f2b564dac..c855996cf1 100644 --- a/src/cpu/intel/model_f3x/Makefile.inc +++ b/src/cpu/intel/model_f3x/Makefile.inc @@ -1,5 +1,8 @@ ramstage-y += model_f3x_init.c + +subdirs-y += ../hyperthreading subdirs-y += ../smm/gen1 + ramstage-$(CONFIG_PARALLEL_MP) += ../model_1067x/mp_init.c cpu_microcode_bins += $(wildcard 3rdparty/intel-microcode/intel-ucode/0f-03-*) diff --git a/src/cpu/intel/socket_441/Makefile.inc b/src/cpu/intel/socket_441/Makefile.inc index 46312cef44..9268def5b1 100644 --- a/src/cpu/intel/socket_441/Makefile.inc +++ b/src/cpu/intel/socket_441/Makefile.inc @@ -4,7 +4,6 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../microcode -subdirs-y += ../hyperthreading subdirs-y += ../speedstep bootblock-y += ../car/p4-netburst/cache_as_ram.S diff --git a/src/cpu/intel/socket_BGA956/Makefile.inc b/src/cpu/intel/socket_BGA956/Makefile.inc index 2af44bd757..2c18f66109 100644 --- a/src/cpu/intel/socket_BGA956/Makefile.inc +++ b/src/cpu/intel/socket_BGA956/Makefile.inc @@ -4,7 +4,6 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../microcode -subdirs-y += ../hyperthreading subdirs-y += ../speedstep bootblock-y += ../car/core2/cache_as_ram.S diff --git a/src/cpu/intel/socket_FCBGA559/Makefile.inc b/src/cpu/intel/socket_FCBGA559/Makefile.inc index fd2c9d8681..7904e17862 100644 --- a/src/cpu/intel/socket_FCBGA559/Makefile.inc +++ b/src/cpu/intel/socket_FCBGA559/Makefile.inc @@ -4,7 +4,6 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../microcode -subdirs-y += ../hyperthreading subdirs-y += ../speedstep bootblock-y += ../car/bootblock.c diff --git a/src/cpu/intel/socket_LGA775/Makefile.inc b/src/cpu/intel/socket_LGA775/Makefile.inc index 8cc9a94ef9..9b571f5cb6 100644 --- a/src/cpu/intel/socket_LGA775/Makefile.inc +++ b/src/cpu/intel/socket_LGA775/Makefile.inc @@ -9,7 +9,6 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../microcode -subdirs-y += ../hyperthreading subdirs-y += ../speedstep bootblock-y += ../car/p4-netburst/cache_as_ram.S diff --git a/src/cpu/intel/socket_m/Makefile.inc b/src/cpu/intel/socket_m/Makefile.inc index 84fc7a229e..4fd01ac392 100644 --- a/src/cpu/intel/socket_m/Makefile.inc +++ b/src/cpu/intel/socket_m/Makefile.inc @@ -5,7 +5,6 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../microcode -subdirs-y += ../hyperthreading subdirs-y += ../speedstep bootblock-y += ../car/core2/cache_as_ram.S diff --git a/src/cpu/intel/socket_mPGA604/Makefile.inc b/src/cpu/intel/socket_mPGA604/Makefile.inc index 9fc9d15352..32bb474c06 100644 --- a/src/cpu/intel/socket_mPGA604/Makefile.inc +++ b/src/cpu/intel/socket_mPGA604/Makefile.inc @@ -4,7 +4,6 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../microcode -subdirs-y += ../hyperthreading bootblock-y += ../car/p4-netburst/cache_as_ram.S bootblock-y += ../car/bootblock.c diff --git a/src/cpu/intel/socket_p/Makefile.inc b/src/cpu/intel/socket_p/Makefile.inc index 8e3cb2cee8..4156052a33 100644 --- a/src/cpu/intel/socket_p/Makefile.inc +++ b/src/cpu/intel/socket_p/Makefile.inc @@ -5,7 +5,6 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../microcode -subdirs-y += ../hyperthreading subdirs-y += ../speedstep bootblock-y += ../car/core2/cache_as_ram.S