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)
 {