[coreboot-gerrit] Patch set updated for coreboot: 6624699 AGESA: Handle MMCONF region setup better

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7811

-gerrit

commit 6624699a29c660b29ecdcdf976965e25ba1c7c5f
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sun Dec 14 11:24:36 2014 +0200

    AGESA: Handle MMCONF region setup better
    
    Change-Id: I9172769c314850b384abbddf0200d5833e2a8b26
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/northbridge/amd/agesa/agesawrapper.h          | 2 --
 src/northbridge/amd/agesa/family12/agesawrapper.c | 2 +-
 src/northbridge/amd/agesa/family15/agesawrapper.c | 2 +-
 src/northbridge/amd/pi/agesawrapper.h             | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/northbridge/amd/agesa/agesawrapper.h b/src/northbridge/amd/agesa/agesawrapper.h
index 421212e..6649eb9 100644
--- a/src/northbridge/amd/agesa/agesawrapper.h
+++ b/src/northbridge/amd/agesa/agesawrapper.h
@@ -24,8 +24,6 @@
 #include "Porting.h"
 #include "AGESA.h"
 
-#define PCIE_BASE_ADDRESS	 CONFIG_MMCONF_BASE_ADDRESS
-
 enum {
 	PICK_DMI,       /* DMI Interface */
 	PICK_PSTATE,    /* Acpi Pstate SSDT Table */
diff --git a/src/northbridge/amd/agesa/family12/agesawrapper.c b/src/northbridge/amd/agesa/family12/agesawrapper.c
index 0c441ee..f25e737 100644
--- a/src/northbridge/amd/agesa/family12/agesawrapper.c
+++ b/src/northbridge/amd/agesa/family12/agesawrapper.c
@@ -151,7 +151,7 @@ AGESA_STATUS agesawrapper_amdinitcpuio(VOID)
 	PciData = 0x00FFFF00 | 0x80;
 	LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
 	PciAddress.AddressValue = MAKE_SBDFO(0, 0, 0x18, 1, 0xB8);
-	PciData = (PCIE_BASE_ADDRESS >> 8) | 03;
+	PciData = (CONFIG_MMCONF_BASE_ADDRESS >> 8) | 03;
 	LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
 	/* Start to set PCIIO 0000-FFFF to Node0 Link0 with ISA&VGA set. */
 	PciAddress.AddressValue = MAKE_SBDFO(0, 0, 0x18, 1, 0xC4);
diff --git a/src/northbridge/amd/agesa/family15/agesawrapper.c b/src/northbridge/amd/agesa/family15/agesawrapper.c
index 0552a02..2bc3e95 100644
--- a/src/northbridge/amd/agesa/family15/agesawrapper.c
+++ b/src/northbridge/amd/agesa/family15/agesawrapper.c
@@ -136,7 +136,7 @@ AGESA_STATUS agesawrapper_amdinitcpuio(void)
 		PciData |= sblink << 4;
 		LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
 		PciAddress.AddressValue = MAKE_SBDFO(0, 0, CONFIG_CDB + node, FUNC_1, 0xB8);
-		PciData = (PCIE_BASE_ADDRESS >> 8) | 0x03;
+		PciData = (CONFIG_MMCONF_BASE_ADDRESS >> 8) | 0x03;
 		LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
 
 		/* Set PCIO: 0x0 - 0xFFF000 to Node0 sbLink  and enabled VGA IO */
diff --git a/src/northbridge/amd/pi/agesawrapper.h b/src/northbridge/amd/pi/agesawrapper.h
index d6558c4..eefde35 100644
--- a/src/northbridge/amd/pi/agesawrapper.h
+++ b/src/northbridge/amd/pi/agesawrapper.h
@@ -24,8 +24,6 @@
 #include "Porting.h"
 #include "AGESA.h"
 
-#define PCIE_BASE_ADDRESS   CONFIG_MMCONF_BASE_ADDRESS
-
 enum {
 	PICK_DMI,       /* DMI Interface */
 	PICK_PSTATE,    /* Acpi Pstate SSDT Table */