4 files changed, 7 insertions, 7 deletions
diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c
index 16058b6d6b..56a7f53706 100644
--- a/src/mainboard/amd/inagua/BiosCallOuts.c
+++ b/src/mainboard/amd/inagua/BiosCallOuts.c
@@ -38,7 +38,7 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP
 	MemData = ConfigPtr;
 
 	Status  = AGESA_SUCCESS;
-	GpioMmioAddr = ACPIMMIO_GPIO_BASE_100;
+	GpioMmioAddr = (uintptr_t)acpimmio_gpio_100;
 
 	Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178);
 	Data8 &= ~BIT5;
@@ -109,7 +109,7 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi
 
 	FcnData   = Data;
 	ResetInfo = ConfigPtr;
-	GpioMmioAddr = ACPIMMIO_GPIO_BASE_100;
+	GpioMmioAddr = (uintptr_t)acpimmio_gpio_100;
 	Status = AGESA_UNSUPPORTED;
 	switch (ResetInfo->ResetId) {
 	case 4:
diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c
index 1734bc9303..bee2f9eb6b 100644
--- a/src/mainboard/amd/persimmon/BiosCallOuts.c
+++ b/src/mainboard/amd/persimmon/BiosCallOuts.c
@@ -45,7 +45,7 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi
 	FcnData = Data;
 	ResetInfo = ConfigPtr;
 	Status = AGESA_UNSUPPORTED;
-	GpioMmioAddr = ACPIMMIO_GPIO_BASE_100;
+	GpioMmioAddr = (uintptr_t)acpimmio_gpio_100;
 	switch (ResetInfo->ResetId)
 	{
 	case 46:	// GPIO50 = SBGPIO_PCIE_RST# affects LAN0, LAN1, PCIe slot
diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c
index a4438f5fe7..6216a3f0a4 100644
--- a/src/mainboard/amd/south_station/BiosCallOuts.c
+++ b/src/mainboard/amd/south_station/BiosCallOuts.c
@@ -38,7 +38,7 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP
 	MemData = ConfigPtr;
 
 	Status = AGESA_SUCCESS;
-	GpioMmioAddr = ACPIMMIO_GPIO_BASE_100;
+	GpioMmioAddr = (uintptr_t)acpimmio_gpio_100;
 
 	Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178);
 	Data8 &= ~BIT5;
@@ -106,7 +106,7 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi
 	UINT32                 GpioMmioAddr;
 	UINT8                  Data8;
 
-	GpioMmioAddr = ACPIMMIO_GPIO_BASE_100;
+	GpioMmioAddr = (uintptr_t)acpimmio_gpio_100;
 
 	FcnData = Data;
 	ResetInfo = ConfigPtr;
diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c
index deb6176faf..c324fd6f02 100644
--- a/src/mainboard/amd/union_station/BiosCallOuts.c
+++ b/src/mainboard/amd/union_station/BiosCallOuts.c
@@ -38,7 +38,7 @@ static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINTN Data, VOID *ConfigP
 	MemData = ConfigPtr;
 
 	Status = AGESA_SUCCESS;
-	GpioMmioAddr = ACPIMMIO_GPIO_BASE_100;
+	GpioMmioAddr = (uintptr_t)acpimmio_gpio_100;
 
 	Data8 = Read64Mem8(GpioMmioAddr+SB_GPIO_REG178);
 	Data8 &= ~BIT5;
@@ -106,7 +106,7 @@ static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINTN Data, VOID *Confi
 	UINT32                  GpioMmioAddr;
 	UINT8                   Data8;
 
-	GpioMmioAddr = ACPIMMIO_GPIO_BASE_100;
+	GpioMmioAddr = (uintptr_t)acpimmio_gpio_100;
 
 	FcnData = Data;
 	ResetInfo = ConfigPtr;