summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2019-05-02 17:58:12 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-05-06 10:32:42 +0000
commite09caf6428bbda556df7089a46abcf7dd26bb3a3 (patch)
tree8a81134711162205bf729fb3e418e22ef2a2ac05
parentc4ab50cdde4bfd01ec7509012b105c88bcf4c953 (diff)
soc/amd/stoneyridge: Move acpi_fill_mcfg to northbridge
Relocate the function to the more appropriate file. Change-Id: I92a3e8d0461ae228f6c01567db159e2458de5f6b Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32550 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/soc/amd/stoneyridge/lpc.c13
-rw-r--r--src/soc/amd/stoneyridge/northbridge.c12
2 files changed, 12 insertions, 13 deletions
diff --git a/src/soc/amd/stoneyridge/lpc.c b/src/soc/amd/stoneyridge/lpc.c
index 87da9f1271..9a8c8efdee 100644
--- a/src/soc/amd/stoneyridge/lpc.c
+++ b/src/soc/amd/stoneyridge/lpc.c
@@ -25,7 +25,6 @@
#include <pc80/mc146818rtc.h>
#include <pc80/isa-dma.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
#include <pc80/i8254.h>
#include <pc80/i8259.h>
#include <soc/acpi.h>
@@ -326,18 +325,6 @@ static void lpc_enable_resources(struct device *dev)
lpc_enable_childrens_resources(dev);
}
-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);
-
- return current;
-}
-
static struct pci_operations lops_pci = {
.set_subsystem = pci_dev_set_subsystem,
};
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index 42963c0941..5985832c81 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -176,6 +176,18 @@ static void northbridge_init(struct device *dev)
setup_ioapic((u8 *)IO_APIC2_ADDR, CONFIG_MAX_CPUS+1);
}
+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);
+
+ return current;
+}
+
static unsigned long acpi_fill_hest(acpi_hest_t *hest)
{
void *addr, *current;