diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig
index 49af384..929af13 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -104,6 +104,9 @@
 config MMCONF_BASE_ADDRESS
 	default 0x80000000
 
+config MMCONF_BUS_NUMBER
+	default 256
+
 config HEAP_SIZE
 	hex
 	default 0x80000
diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
index 5e1b412..0d102a1 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
@@ -17,14 +17,6 @@
 #include <soc/soc_util.h>
 #include <soc/util.h>
 
-/* TODO: Check if the common/acpi weak function can be used */
-unsigned long acpi_fill_mcfg(unsigned long current)
-{
-	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
-		CONFIG_MMCONF_BASE_ADDRESS, 0, 0, 255);
-	return current;
-}
-
 int soc_madt_sci_irq_polarity(int sci)
 {
 	if (sci >= 20)
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index 79768d4..1f1d058 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -16,14 +16,6 @@
 #include <soc/soc_util.h>
 #include <soc/util.h>
 
-/* TODO: Check if the common/acpi weak function can be used */
-unsigned long acpi_fill_mcfg(unsigned long current)
-{
-	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
-		CONFIG_MMCONF_BASE_ADDRESS, 0, 0, 255);
-	return current;
-}
-
 int soc_madt_sci_irq_polarity(int sci)
 {
 	if (sci >= 20)