From 6e5cc4ce7c6228aa245796e818ec00124c4e9f4a Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Tue, 16 Jan 2024 20:48:40 +0100
Subject: arch/x86/mpspec: turn compile-time check into Kconfig dependency
Instead of checking if there is more than one PCI segment group and
erroring out in that case during the build, add this requirement as a
dependency to the GENERATE_MP_TABLE Kconfig option. The mpspec.c source
file only gets included in the build if GENERATE_MP_TABLE is selected.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Suggested-by: Martin Roth <gaumless@gmail.com>
Change-Id: Ie532a401ad0161890d0fb4ca2889af022d5f6b47
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79994
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
---
src/Kconfig | 1 +
src/arch/x86/mpspec.c | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/Kconfig b/src/Kconfig
index 7867f44e96..21c50c5648 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -906,6 +906,7 @@ menu "System tables"
config GENERATE_MP_TABLE
prompt "Generate an MP table" if HAVE_MP_TABLE
bool
+ depends on !ECAM_MMCONF_SUPPORT || ECAM_MMCONF_BUS_NUMBER <= 256
default HAVE_MP_TABLE
help
Generate an MP table (conforming to the Intel MultiProcessor
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c
index 3b4c8ad529..7744f68e85 100644
--- a/src/arch/x86/mpspec.c
+++ b/src/arch/x86/mpspec.c
@@ -14,10 +14,6 @@
#include <stdint.h>
#include <string.h>
-#if CONFIG(ECAM_MMCONF_SUPPORT) && PCI_SEGMENT_GROUP_COUNT > 1
-#error "MPTable doesn't support systems with multiple PCI segment groups"
-#endif
-
/* Initialize the specified "mc" struct with initial values. */
void mptable_init(struct mp_config_table *mc)
{
--
cgit v1.2.3