summaryrefslogtreecommitdiff
path: root/src/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'src/acpi')
-rw-r--r--src/acpi/acpi.c5
-rw-r--r--src/acpi/dsdt_top.asl6
2 files changed, 6 insertions, 5 deletions
diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c
index 60f8c21335..78c3fd3b90 100644
--- a/src/acpi/acpi.c
+++ b/src/acpi/acpi.c
@@ -266,7 +266,8 @@ void acpi_create_madt(acpi_madt_t *madt)
static unsigned long acpi_fill_mcfg(unsigned long current)
{
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
- CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
+ CONFIG_ECAM_MMCONF_BASE_ADDRESS, 0, 0,
+ CONFIG_ECAM_MMCONF_BUS_NUMBER - 1);
return current;
}
@@ -291,7 +292,7 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg)
header->length = sizeof(acpi_mcfg_t);
header->revision = get_acpi_table_revision(MCFG);
- if (CONFIG(MMCONF_SUPPORT))
+ if (CONFIG(ECAM_MMCONF_SUPPORT))
current = acpi_fill_mcfg(current);
/* (Re)calculate length and checksum. */
diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl
index ff148aef74..7b9b2d823e 100644
--- a/src/acpi/dsdt_top.asl
+++ b/src/acpi/dsdt_top.asl
@@ -31,13 +31,13 @@ Method (_PIC, 1)
PICM = Arg0
}
-#if CONFIG(MMCONF_SUPPORT)
+#if CONFIG(ECAM_MMCONF_SUPPORT)
Scope(\_SB) {
/* Base address of PCIe config space */
- Name(PCBA, CONFIG_MMCONF_BASE_ADDRESS)
+ Name(PCBA, CONFIG_ECAM_MMCONF_BASE_ADDRESS)
/* Length of PCIe config space, 1MB each bus */
- Name(PCLN, CONFIG_MMCONF_LENGTH)
+ Name(PCLN, CONFIG_ECAM_MMCONF_LENGTH)
/* PCIe Configuration Space */
OperationRegion(PCFG, SystemMemory, PCBA, PCLN) /* Each bus consumes 1MB */