[coreboot-gerrit] Patch set updated for coreboot: 0791d61 AGESA: Fix error status code return type to enum from UINT32

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6182

-gerrit

commit 0791d614ad2adfe46a357ade28b636030535837d
Author: Edward O'Callaghan 
Date:   Sat Jul 5 15:24:50 2014 +1000

AGESA: Fix error status code return type to enum from UINT32

AGESA correctly uses the enum AGESA_STATUS type whereas boards use a
    mess of UINT32 typecasts.

Also no need to shout VOID. We are not that careful on changing
    all cases of VOID->void or whitespace issues as these files will
    get merged with follow-ups.

Change-Id: I16ccfcc73cda6b917c7ff5fd42ee2cd04e7dc0dd
    Signed-off-by: Edward O'Callaghan 
    Signed-off-by: Kyösti Mälkki 
---
 src/mainboard/amd/dinar/agesawrapper.c             | 62 ++++++----------
 src/mainboard/amd/dinar/agesawrapper.h             | 20 +++---
 src/mainboard/amd/inagua/agesawrapper.c            | 50 ++++++-------
 src/mainboard/amd/inagua/agesawrapper.h            | 26 +++----
 src/mainboard/amd/olivehill/agesawrapper.c         | 82 ++++++++--------------
 src/mainboard/amd/olivehill/agesawrapper.h         | 30 ++++----
 src/mainboard/amd/parmer/agesawrapper.c            | 82 ++++++++--------------
 src/mainboard/amd/parmer/agesawrapper.h            | 30 ++++----
 src/mainboard/amd/persimmon/agesawrapper.c         | 65 +++++++----------
 src/mainboard/amd/persimmon/agesawrapper.h         | 30 ++++----
 src/mainboard/amd/south_station/agesawrapper.c     | 50 ++++++-------
 src/mainboard/amd/south_station/agesawrapper.h     | 26 +++----
 src/mainboard/amd/thatcher/agesawrapper.c          | 82 ++++++++--------------
 src/mainboard/amd/thatcher/agesawrapper.h          | 30 ++++----
 src/mainboard/amd/torpedo/agesawrapper.c           | 49 ++++++-------
 src/mainboard/amd/torpedo/agesawrapper.h           | 22 +++---
 src/mainboard/amd/union_station/agesawrapper.c     | 50 ++++++-------
 src/mainboard/amd/union_station/agesawrapper.h     | 26 +++----
 src/mainboard/asrock/e350m1/agesawrapper.c         | 50 ++++++-------
 src/mainboard/asrock/e350m1/agesawrapper.h         | 22 +++---
 src/mainboard/asrock/imb-a180/agesawrapper.c       | 82 ++++++++--------------
 src/mainboard/asrock/imb-a180/agesawrapper.h       | 30 ++++----
 src/mainboard/asus/f2a85-m/agesawrapper.c          | 82 ++++++++--------------
 src/mainboard/asus/f2a85-m/agesawrapper.h          | 30 ++++----
 src/mainboard/gizmosphere/gizmo/agesawrapper.c     | 65 +++++++----------
 src/mainboard/gizmosphere/gizmo/agesawrapper.h     | 26 +++----
 src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c | 75 +++++++-------------
 src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h | 30 ++++----
 .../lippert/frontrunner-af/agesawrapper.c          | 65 +++++++----------
 .../lippert/frontrunner-af/agesawrapper.h          | 26 +++----
 src/mainboard/lippert/toucan-af/agesawrapper.c     | 65 +++++++----------
 src/mainboard/lippert/toucan-af/agesawrapper.h     | 26 +++----
 src/mainboard/supermicro/h8qgi/agesawrapper.c      | 50 ++++++-------
 src/mainboard/supermicro/h8qgi/agesawrapper.h      | 20 +++---
 src/mainboard/supermicro/h8scm/agesawrapper.c      | 50 ++++++-------
 src/mainboard/supermicro/h8scm/agesawrapper.h      | 20 +++---
 src/mainboard/tyan/s8226/agesawrapper.c            | 53 +++++++-------
 src/mainboard/tyan/s8226/agesawrapper.h            | 20 +++---
 38 files changed, 710 insertions(+), 989 deletions(-)

diff --git a/src/mainboard/amd/dinar/agesawrapper.c b/src/mainboard/amd/dinar/agesawrapper.c
index f8a5803..a8fc62e 100644
--- a/src/mainboard/amd/dinar/agesawrapper.c
+++ b/src/mainboard/amd/dinar/agesawrapper.c
@@ -78,7 +78,7 @@ GetEndBusNum (
    return Index;
 }

-static UINT32 amdinitcpuio(VOID)
+static UINT32 amdinitcpuio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -195,13 +195,10 @@ static UINT32 amdinitcpuio(VOID)
    	LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    }
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
-		VOID
-		)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -248,13 +245,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20F, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
-		VOID
-		)
+AGESA_STATUS agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status;
 #if (defined AGESA_ENTRY_INIT_RESET) && (AGESA_ENTRY_INIT_RESET == TRUE)
@@ -291,13 +285,10 @@ agesawrapper_amdinitreset (
    status = AGESA_SUCCESS;
 #endif

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
-		VOID
-		)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -323,7 +314,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }
 /**
  *  OemCustomizeInitEarly
@@ -354,10 +345,7 @@ OemCustomizeInitPost (
    InitPost->MemConfig.UmaSize = 0xE0-0xC0;
 }

-UINT32
-agesawrapper_amdinitpost (
-		VOID
-		)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -386,13 +374,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
-		VOID
-		)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -413,7 +398,7 @@ agesawrapper_amdinitenv (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -444,10 +429,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
-		VOID
-		)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -474,11 +456,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate(VOID)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS		Status;
    AMD_INTERFACE_PARAMS	AmdParamStruct;
@@ -526,10 +507,10 @@ agesawrapper_amdinitlate(VOID)
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
    AGESA_STATUS Status;
    AP_EXE_PARAMS AmdLateParams;
@@ -550,13 +531,10 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
-		VOID
-		)
+AGESA_STATUS agesawrapper_amdreadeventlog(void)
 {
    AGESA_STATUS Status;
    EVENT_PARAMS AmdEventParams;
@@ -578,5 +556,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/dinar/agesawrapper.h b/src/mainboard/amd/dinar/agesawrapper.h
index b8b8db8..70cf4f6 100644
--- a/src/mainboard/amd/dinar/agesawrapper.h
+++ b/src/mainboard/amd/dinar/agesawrapper.h
@@ -84,16 +84,16 @@ enum {

//void brazos_platform_stage(void);
-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (void);
-UINT32 agesawrapper_amdinitmmio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/amd/inagua/agesawrapper.c b/src/mainboard/amd/inagua/agesawrapper.c
index a375e84..49b96b5 100644
--- a/src/mainboard/amd/inagua/agesawrapper.c
+++ b/src/mainboard/amd/inagua/agesawrapper.c
@@ -47,8 +47,7 @@ VOID *AcpiWheaMce	= NULL;
 VOID *AcpiWheaCmc	= NULL;
 VOID *AcpiAlib		= NULL;

-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    	VOID
    	)
 {
@@ -93,11 +92,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    	VOID
    	)
 {
@@ -143,11 +141,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    	VOID
    	)
 {
@@ -172,11 +169,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    	VOID
    	)
 {
@@ -201,11 +197,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    	VOID
    	)
 {
@@ -229,11 +224,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    	VOID
    	)
 {
@@ -327,7 +321,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -355,8 +349,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    	VOID
    	)
 {
@@ -381,11 +374,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    	VOID
    	)
 {
@@ -431,11 +423,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    	UINT32 Func,
    	UINT32 Data,
    	VOID *ConfigPtr
@@ -459,11 +450,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    	VOID
    	)
 {
@@ -484,5 +474,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/inagua/agesawrapper.h b/src/mainboard/amd/inagua/agesawrapper.h
index 6e15a25..3f7549e 100644
--- a/src/mainboard/amd/inagua/agesawrapper.h
+++ b/src/mainboard/amd/inagua/agesawrapper.h
@@ -39,19 +39,19 @@ enum {
    PICK_ALIB,      /* SACPI SSDT table with ALIB implementation */
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-
-UINT32 agesawrapper_amdreadeventlog (void);
-
-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/amd/olivehill/agesawrapper.c b/src/mainboard/amd/olivehill/agesawrapper.c
index 8e3cb61..b7b56ac 100644
--- a/src/mainboard/amd/olivehill/agesawrapper.c
+++ b/src/mainboard/amd/olivehill/agesawrapper.c
@@ -56,10 +56,7 @@ VOID *AcpiWheaCmc = NULL;
 VOID *AcpiAlib    = NULL;
 VOID *AcpiIvrs    = NULL;

-UINT32
-agesawrapper_amdinitcpuio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -102,13 +99,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -142,13 +136,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -182,13 +173,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -214,13 +202,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -246,13 +231,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -279,7 +261,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -309,10 +291,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -339,13 +318,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -391,11 +367,10 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

/* AmdReleaseStruct (&AmdParamStruct); */
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -422,11 +397,11 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitresume(VOID)
+AGESA_STATUS agesawrapper_amdinitresume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -460,11 +435,11 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

#ifndef __PRE_RAM__
-UINT32 agesawrapper_fchs3earlyrestore (VOID)
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -487,7 +462,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID)
 }
 #endif

-UINT32 agesawrapper_amds3laterestore (VOID)
+AGESA_STATUS agesawrapper_amds3laterestore(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS    AmdInterfaceParams;
@@ -523,14 +498,14 @@ UINT32 agesawrapper_amds3laterestore (VOID)
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__

extern UINT8 picr_data[0x54], intr_data[0x54];

-UINT32 agesawrapper_fchs3laterestore (VOID)
+AGESA_STATUS agesawrapper_fchs3laterestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -566,7 +541,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)

#ifndef __PRE_RAM__

-UINT32 agesawrapper_amdS3Save(VOID)
+AGESA_STATUS agesawrapper_amdS3Save(void)
 {
    AGESA_STATUS Status;
    AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr;
@@ -622,13 +597,12 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }

#endif  /* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    UINT8 HeapStatus
    )
 {
@@ -653,5 +627,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/olivehill/agesawrapper.h b/src/mainboard/amd/olivehill/agesawrapper.h
index cccb5c9..9e4617d 100644
--- a/src/mainboard/amd/olivehill/agesawrapper.h
+++ b/src/mainboard/amd/olivehill/agesawrapper.h
@@ -40,22 +40,22 @@ enum {
    PICK_IVRS,      /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitcpuio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
-UINT32 agesawrapper_amdS3Save(VOID);
-UINT32 agesawrapper_amdinitresume(VOID);
-UINT32 agesawrapper_amds3laterestore (VOID);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);

-UINT32 agesawrapper_fchs3earlyrestore (VOID);
-UINT32 agesawrapper_fchs3laterestore (VOID);
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
+AGESA_STATUS agesawrapper_fchs3laterestore(void);

#endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c
index 85c1474..42fb3e6 100644
--- a/src/mainboard/amd/parmer/agesawrapper.c
+++ b/src/mainboard/amd/parmer/agesawrapper.c
@@ -56,10 +56,7 @@ VOID *AcpiWheaCmc = NULL;
 VOID *AcpiAlib    = NULL;
 VOID *AcpiIvrs    = NULL;

-UINT32
-agesawrapper_amdinitcpuio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -102,13 +99,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -142,13 +136,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -182,13 +173,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -214,13 +202,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -247,13 +232,10 @@ agesawrapper_amdinitpost (
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -280,7 +262,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -310,10 +292,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -340,13 +319,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -392,11 +368,10 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

/* AmdReleaseStruct (&AmdParamStruct); */
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -423,11 +398,11 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitresume(VOID)
+AGESA_STATUS agesawrapper_amdinitresume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -461,11 +436,11 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

#ifndef __PRE_RAM__
-UINT32 agesawrapper_fchs3earlyrestore (VOID)
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -489,7 +464,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID)
 }
 #endif

-UINT32 agesawrapper_amds3laterestore (VOID)
+AGESA_STATUS agesawrapper_amds3laterestore(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS    AmdInterfaceParams;
@@ -525,14 +500,14 @@ UINT32 agesawrapper_amds3laterestore (VOID)
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__

extern UINT8 picr_data[0x54], intr_data[0x54];

-UINT32 agesawrapper_fchs3laterestore (VOID)
+AGESA_STATUS agesawrapper_fchs3laterestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -569,7 +544,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)

#ifndef __PRE_RAM__

-UINT32 agesawrapper_amdS3Save(VOID)
+AGESA_STATUS agesawrapper_amdS3Save(void)
 {
    AGESA_STATUS Status;
    AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr;
@@ -625,13 +600,12 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }

#endif  /* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    UINT8 HeapStatus
    )
 {
@@ -656,5 +630,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/parmer/agesawrapper.h b/src/mainboard/amd/parmer/agesawrapper.h
index cccb5c9..9e4617d 100644
--- a/src/mainboard/amd/parmer/agesawrapper.h
+++ b/src/mainboard/amd/parmer/agesawrapper.h
@@ -40,22 +40,22 @@ enum {
    PICK_IVRS,      /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitcpuio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
-UINT32 agesawrapper_amdS3Save(VOID);
-UINT32 agesawrapper_amdinitresume(VOID);
-UINT32 agesawrapper_amds3laterestore (VOID);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);

-UINT32 agesawrapper_fchs3earlyrestore (VOID);
-UINT32 agesawrapper_fchs3laterestore (VOID);
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
+AGESA_STATUS agesawrapper_fchs3laterestore(void);

#endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/amd/persimmon/agesawrapper.c b/src/mainboard/amd/persimmon/agesawrapper.c
index cfd0eee..b3a217a 100644
--- a/src/mainboard/amd/persimmon/agesawrapper.c
+++ b/src/mainboard/amd/persimmon/agesawrapper.c
@@ -46,8 +46,7 @@ VOID *AcpiWheaMce	= NULL;
 VOID *AcpiWheaCmc	= NULL;
 VOID *AcpiAlib		= NULL;

-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    VOID
    )
 {
@@ -92,11 +91,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    VOID
    )
 {
@@ -142,11 +140,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    VOID
    )
 {
@@ -171,11 +168,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    VOID
    )
 {
@@ -200,11 +196,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    VOID
    )
 {
@@ -228,11 +223,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    VOID
    )
 {
@@ -326,7 +320,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -354,8 +348,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    VOID
    )
 {
@@ -380,11 +373,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    VOID
    )
 {
@@ -430,11 +422,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitresume (
+AGESA_STATUS agesawrapper_amdinitresume (
   VOID
   )
 {
@@ -468,11 +459,10 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amds3laterestore (
+AGESA_STATUS agesawrapper_amds3laterestore (
   VOID
   )
 {
@@ -507,12 +497,11 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__
-UINT32
-agesawrapper_amdS3Save (
+AGESA_STATUS agesawrapper_amdS3Save (
    VOID
    )
 {
@@ -561,12 +550,11 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }
 #endif	/* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -590,11 +578,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    VOID
    )
 {
@@ -615,5 +602,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/persimmon/agesawrapper.h b/src/mainboard/amd/persimmon/agesawrapper.h
index c16dab2..d14603e 100644
--- a/src/mainboard/amd/persimmon/agesawrapper.h
+++ b/src/mainboard/amd/persimmon/agesawrapper.h
@@ -39,21 +39,21 @@ enum {
    PICK_ALIB,		/* SACPI SSDT table with ALIB implementation */
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-
-UINT32 agesawrapper_amdreadeventlog (void);
-
-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitresume (void);
-UINT32 agesawrapper_amdS3Save (void);
-UINT32 agesawrapper_amds3laterestore (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

#endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/amd/south_station/agesawrapper.c b/src/mainboard/amd/south_station/agesawrapper.c
index 7c8aab8..98dd09d 100644
--- a/src/mainboard/amd/south_station/agesawrapper.c
+++ b/src/mainboard/amd/south_station/agesawrapper.c
@@ -47,8 +47,7 @@ VOID *AcpiWheaMce	= NULL;
 VOID *AcpiWheaCmc	= NULL;
 VOID *AcpiAlib		= NULL;

-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    VOID
    )
 {
@@ -93,11 +92,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    VOID
    )
 {
@@ -143,11 +141,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    VOID
    )
 {
@@ -172,11 +169,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
  }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    VOID
    )
 {
@@ -201,11 +197,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    VOID
    )
 {
@@ -229,11 +224,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    VOID
    )
 {
@@ -327,7 +321,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -355,8 +349,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    VOID
    )
 {
@@ -381,11 +374,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    VOID
    )
 {
@@ -426,11 +418,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -454,11 +445,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    VOID
    )
 {
@@ -479,5 +469,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/south_station/agesawrapper.h b/src/mainboard/amd/south_station/agesawrapper.h
index 47332c5..65c14e9 100644
--- a/src/mainboard/amd/south_station/agesawrapper.h
+++ b/src/mainboard/amd/south_station/agesawrapper.h
@@ -39,19 +39,19 @@ enum {
   PICK_ALIB,      /* SACPI SSDT table with ALIB implementation */
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-
-UINT32 agesawrapper_amdreadeventlog (void);
-
-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/amd/thatcher/agesawrapper.c b/src/mainboard/amd/thatcher/agesawrapper.c
index 7ab9e44..7f6a703 100644
--- a/src/mainboard/amd/thatcher/agesawrapper.c
+++ b/src/mainboard/amd/thatcher/agesawrapper.c
@@ -56,10 +56,7 @@ VOID *AcpiWheaCmc = NULL;
 VOID *AcpiAlib    = NULL;
 VOID *AcpiIvrs    = NULL;

-UINT32
-agesawrapper_amdinitcpuio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -102,13 +99,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -142,13 +136,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -180,13 +171,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -212,13 +200,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -244,13 +229,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -277,7 +259,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -307,10 +289,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -337,13 +316,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -389,11 +365,10 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

/* AmdReleaseStruct (&AmdParamStruct); */
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -420,11 +395,11 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitresume(VOID)
+AGESA_STATUS agesawrapper_amdinitresume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -460,11 +435,11 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

#ifndef __PRE_RAM__
-UINT32 agesawrapper_fchs3earlyrestore (VOID)
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -487,7 +462,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID)
 }
 #endif

-UINT32 agesawrapper_amds3laterestore (VOID)
+AGESA_STATUS agesawrapper_amds3laterestore(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS    AmdInterfaceParams;
@@ -525,14 +500,14 @@ UINT32 agesawrapper_amds3laterestore (VOID)
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__

extern UINT8 picr_data[0x54], intr_data[0x54];

-UINT32 agesawrapper_fchs3laterestore (VOID)
+AGESA_STATUS agesawrapper_fchs3laterestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -568,7 +543,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)

#ifndef __PRE_RAM__

-UINT32 agesawrapper_amdS3Save(VOID)
+AGESA_STATUS agesawrapper_amdS3Save(void)
 {
    AGESA_STATUS Status;
    AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr;
@@ -627,13 +602,12 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }

#endif  /* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    UINT8 HeapStatus
    )
 {
@@ -658,5 +632,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/thatcher/agesawrapper.h b/src/mainboard/amd/thatcher/agesawrapper.h
index cccb5c9..9e4617d 100644
--- a/src/mainboard/amd/thatcher/agesawrapper.h
+++ b/src/mainboard/amd/thatcher/agesawrapper.h
@@ -40,22 +40,22 @@ enum {
    PICK_IVRS,      /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitcpuio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
-UINT32 agesawrapper_amdS3Save(VOID);
-UINT32 agesawrapper_amdinitresume(VOID);
-UINT32 agesawrapper_amds3laterestore (VOID);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);

-UINT32 agesawrapper_fchs3earlyrestore (VOID);
-UINT32 agesawrapper_fchs3laterestore (VOID);
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
+AGESA_STATUS agesawrapper_fchs3laterestore(void);

#endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/amd/torpedo/agesawrapper.c b/src/mainboard/amd/torpedo/agesawrapper.c
index 556c2a8..4088386 100644
--- a/src/mainboard/amd/torpedo/agesawrapper.c
+++ b/src/mainboard/amd/torpedo/agesawrapper.c
@@ -149,8 +149,7 @@ ClearAllSmiEnableInPmio (
   Mmio32 (SmiMmioAddr, 0xC4) = 0x0;
 }

-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
   VOID
   )
 {
@@ -195,11 +194,10 @@ agesawrapper_amdinitcpuio (
   PciData = 0x00000013;
   LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
   Status = AGESA_SUCCESS;
-  return (UINT32)Status;
+  return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
   VOID
   )
 {
@@ -259,11 +257,10 @@ agesawrapper_amdinitmmio (
 //-  ClearAllSmiEnableInPmio ();

Status = AGESA_SUCCESS;
-  return (UINT32)Status;
+  return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
   VOID
   )
 {
@@ -296,11 +293,10 @@ agesawrapper_amdinitreset (
   status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);
-  return (UINT32)status;
+  return status;
  }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
   VOID
   )
 {
@@ -328,11 +324,10 @@ agesawrapper_amdinitearly (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);

-  return (UINT32)status;
+  return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
   VOID
   )
 {
@@ -359,11 +354,10 @@ agesawrapper_amdinitpost (
   /* Initialize heap space */
    EmptyHeap();

-  return (UINT32)status;
+  return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
   VOID
   )
 {
@@ -386,7 +380,7 @@ agesawrapper_amdinitenv (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);

-  return (UINT32)status;
+  return status;
 }

VOID *
@@ -417,8 +411,7 @@ agesawrapper_getlateinitptr (
   }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
   VOID
   )
 {
@@ -446,11 +439,10 @@ agesawrapper_amdinitmid (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);

-  return (UINT32)status;
+  return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
   VOID
   )
 {
@@ -482,10 +474,10 @@ agesawrapper_amdinitlate (
   AcpiWheaCmc    = AmdLateParams.AcpiWheaCmc;
   AcpiAlib       = AmdLateParams.AcpiAlib;

-  return (UINT32)Status;
+  return Status;
 }

-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
   AGESA_STATUS Status;
   AP_EXE_PARAMS ApExeParams;
@@ -506,11 +498,10 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
     ASSERT(Status == AGESA_SUCCESS);
   }

-  return (UINT32)Status;
+  return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
   VOID
   )
 {
@@ -534,5 +525,5 @@ agesawrapper_amdreadeventlog (
     Status = AmdReadEventLog (&AmdEventParams);
   }

-  return (UINT32)Status;
+  return Status;
 }
diff --git a/src/mainboard/amd/torpedo/agesawrapper.h b/src/mainboard/amd/torpedo/agesawrapper.h
index 5947b6b..5ca4cfa 100644
--- a/src/mainboard/amd/torpedo/agesawrapper.h
+++ b/src/mainboard/amd/torpedo/agesawrapper.h
@@ -82,18 +82,18 @@ enum {
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);

-UINT32 agesawrapper_amdreadeventlog (void);
-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/amd/union_station/agesawrapper.c b/src/mainboard/amd/union_station/agesawrapper.c
index 7c8aab8..98dd09d 100644
--- a/src/mainboard/amd/union_station/agesawrapper.c
+++ b/src/mainboard/amd/union_station/agesawrapper.c
@@ -47,8 +47,7 @@ VOID *AcpiWheaMce	= NULL;
 VOID *AcpiWheaCmc	= NULL;
 VOID *AcpiAlib		= NULL;

-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    VOID
    )
 {
@@ -93,11 +92,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    VOID
    )
 {
@@ -143,11 +141,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    VOID
    )
 {
@@ -172,11 +169,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
  }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    VOID
    )
 {
@@ -201,11 +197,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    VOID
    )
 {
@@ -229,11 +224,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    VOID
    )
 {
@@ -327,7 +321,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -355,8 +349,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    VOID
    )
 {
@@ -381,11 +374,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    VOID
    )
 {
@@ -426,11 +418,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -454,11 +445,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    VOID
    )
 {
@@ -479,5 +469,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/amd/union_station/agesawrapper.h b/src/mainboard/amd/union_station/agesawrapper.h
index 47332c5..65c14e9 100644
--- a/src/mainboard/amd/union_station/agesawrapper.h
+++ b/src/mainboard/amd/union_station/agesawrapper.h
@@ -39,19 +39,19 @@ enum {
   PICK_ALIB,      /* SACPI SSDT table with ALIB implementation */
 };

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-
-UINT32 agesawrapper_amdreadeventlog (void);
-
-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif /* _AGESAWRAPPER_H_ */
diff --git a/src/mainboard/asrock/e350m1/agesawrapper.c b/src/mainboard/asrock/e350m1/agesawrapper.c
index 6e47880..0e1ce0a 100644
--- a/src/mainboard/asrock/e350m1/agesawrapper.c
+++ b/src/mainboard/asrock/e350m1/agesawrapper.c
@@ -76,8 +76,7 @@ VOID *AcpiAlib		= NULL;
  *						L O C A L		F U N C T I O N S
  *------------------------------------------------------------------------------
  */
-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    VOID
    )
 {
@@ -122,11 +121,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    VOID
    )
 {
@@ -172,11 +170,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    VOID
    )
 {
@@ -201,11 +198,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
  }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    VOID
    )
 {
@@ -230,11 +226,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    VOID
    )
 {
@@ -258,11 +253,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    VOID
    )
 {
@@ -356,7 +350,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -384,8 +378,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    VOID
    )
 {
@@ -410,11 +403,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    VOID
    )
 {
@@ -455,11 +447,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -483,11 +474,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    VOID
    )
 {
@@ -508,5 +498,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/asrock/e350m1/agesawrapper.h b/src/mainboard/asrock/e350m1/agesawrapper.h
index b503559..f28b10d 100644
--- a/src/mainboard/asrock/e350m1/agesawrapper.h
+++ b/src/mainboard/asrock/e350m1/agesawrapper.h
@@ -72,17 +72,17 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.c b/src/mainboard/asrock/imb-a180/agesawrapper.c
index 083de3d..093bb14 100644
--- a/src/mainboard/asrock/imb-a180/agesawrapper.c
+++ b/src/mainboard/asrock/imb-a180/agesawrapper.c
@@ -85,10 +85,7 @@ VOID *AcpiIvrs    = NULL;
  *                          L O C A L    F U N C T I O N S
  *---------------------------------------------------------------------------------------
  */
-UINT32
-agesawrapper_amdinitcpuio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -131,13 +128,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -171,13 +165,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -211,13 +202,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -243,13 +231,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -275,13 +260,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -308,7 +290,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -338,10 +320,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -368,13 +347,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -420,11 +396,10 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

/* AmdReleaseStruct (&AmdParamStruct); */
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -451,11 +426,11 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitresume(VOID)
+AGESA_STATUS agesawrapper_amdinitresume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -489,11 +464,11 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

#ifndef __PRE_RAM__
-UINT32 agesawrapper_fchs3earlyrestore (VOID)
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -516,7 +491,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID)
 }
 #endif

-UINT32 agesawrapper_amds3laterestore (VOID)
+AGESA_STATUS agesawrapper_amds3laterestore(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS    AmdInterfaceParams;
@@ -552,14 +527,14 @@ UINT32 agesawrapper_amds3laterestore (VOID)
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__

extern UINT8 picr_data[0x54], intr_data[0x54];

-UINT32 agesawrapper_fchs3laterestore (VOID)
+AGESA_STATUS agesawrapper_fchs3laterestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -595,7 +570,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)

#ifndef __PRE_RAM__

-UINT32 agesawrapper_amdS3Save(VOID)
+AGESA_STATUS agesawrapper_amdS3Save(void)
 {
    AGESA_STATUS Status;
    AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr;
@@ -651,13 +626,12 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }

#endif  /* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    UINT8 HeapStatus
    )
 {
@@ -682,5 +656,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.h b/src/mainboard/asrock/imb-a180/agesawrapper.h
index 8589db5..60c4add 100644
--- a/src/mainboard/asrock/imb-a180/agesawrapper.h
+++ b/src/mainboard/asrock/imb-a180/agesawrapper.h
@@ -69,22 +69,22 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitcpuio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
-UINT32 agesawrapper_amdS3Save(VOID);
-UINT32 agesawrapper_amdinitresume(VOID);
-UINT32 agesawrapper_amds3laterestore (VOID);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);

-UINT32 agesawrapper_fchs3earlyrestore (VOID);
-UINT32 agesawrapper_fchs3laterestore (VOID);
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
+AGESA_STATUS agesawrapper_fchs3laterestore(void);

#endif
diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.c b/src/mainboard/asus/f2a85-m/agesawrapper.c
index 2a3502a..a964238 100644
--- a/src/mainboard/asus/f2a85-m/agesawrapper.c
+++ b/src/mainboard/asus/f2a85-m/agesawrapper.c
@@ -76,10 +76,7 @@ VOID *AcpiIvrs    = NULL;
  *                          L O C A L    F U N C T I O N S
  *---------------------------------------------------------------------------------------
  */
-UINT32
-agesawrapper_amdinitcpuio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -122,13 +119,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -155,13 +149,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -195,13 +186,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -227,13 +215,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -259,13 +244,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -292,7 +274,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -322,10 +304,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -352,13 +331,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -404,11 +380,10 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

/* AmdReleaseStruct (&AmdParamStruct); */
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -435,11 +410,11 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitresume(VOID)
+AGESA_STATUS agesawrapper_amdinitresume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -475,11 +450,11 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

#ifndef __PRE_RAM__
-UINT32 agesawrapper_fchs3earlyrestore (VOID)
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -502,7 +477,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID)
 }
 #endif

-UINT32 agesawrapper_amds3laterestore (VOID)
+AGESA_STATUS agesawrapper_amds3laterestore(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS    AmdInterfaceParams;
@@ -540,14 +515,14 @@ UINT32 agesawrapper_amds3laterestore (VOID)
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__

extern UINT8 picr_data[0x54], intr_data[0x54];

-UINT32 agesawrapper_fchs3laterestore (VOID)
+AGESA_STATUS agesawrapper_fchs3laterestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -583,7 +558,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)

#ifndef __PRE_RAM__

-UINT32 agesawrapper_amdS3Save(VOID)
+AGESA_STATUS agesawrapper_amdS3Save(void)
 {
    AGESA_STATUS Status;
    AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr;
@@ -642,13 +617,12 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }

#endif  /* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    UINT8 HeapStatus
    )
 {
@@ -673,5 +647,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.h b/src/mainboard/asus/f2a85-m/agesawrapper.h
index 4ae226d..23fcd1b 100644
--- a/src/mainboard/asus/f2a85-m/agesawrapper.h
+++ b/src/mainboard/asus/f2a85-m/agesawrapper.h
@@ -68,22 +68,22 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitcpuio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
-UINT32 agesawrapper_amdS3Save(VOID);
-UINT32 agesawrapper_amdinitresume(VOID);
-UINT32 agesawrapper_amds3laterestore (VOID);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);

-UINT32 agesawrapper_fchs3earlyrestore (VOID);
-UINT32 agesawrapper_fchs3laterestore (VOID);
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
+AGESA_STATUS agesawrapper_fchs3laterestore(void);

#endif
diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.c b/src/mainboard/gizmosphere/gizmo/agesawrapper.c
index 4b29128..c6ef79f 100755
--- a/src/mainboard/gizmosphere/gizmo/agesawrapper.c
+++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.c
@@ -66,8 +66,7 @@ VOID *AcpiAlib		= NULL;
  *						L O C A L		F U N C T I O N S
  *------------------------------------------------------------------------------
  */
-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    VOID
    )
 {
@@ -112,11 +111,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    VOID
    )
 {
@@ -162,11 +160,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    VOID
    )
 {
@@ -191,11 +188,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    VOID
    )
 {
@@ -220,11 +216,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    VOID
    )
 {
@@ -248,11 +243,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    VOID
    )
 {
@@ -346,7 +340,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -374,8 +368,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    VOID
    )
 {
@@ -400,11 +393,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    VOID
    )
 {
@@ -450,11 +442,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitresume (
+AGESA_STATUS agesawrapper_amdinitresume (
   VOID
   )
 {
@@ -488,11 +479,10 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amds3laterestore (
+AGESA_STATUS agesawrapper_amds3laterestore (
   VOID
   )
 {
@@ -527,12 +517,11 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__
-UINT32
-agesawrapper_amdS3Save (
+AGESA_STATUS agesawrapper_amdS3Save (
    VOID
    )
 {
@@ -581,12 +570,11 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }
 #endif	/* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -610,11 +598,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    VOID
    )
 {
@@ -635,5 +622,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.h b/src/mainboard/gizmosphere/gizmo/agesawrapper.h
index 871982a..8be8030 100755
--- a/src/mainboard/gizmosphere/gizmo/agesawrapper.h
+++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.h
@@ -69,21 +69,21 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);

-UINT32 agesawrapper_amdreadeventlog (void);
+AGESA_STATUS agesawrapper_amdreadeventlog(void);

-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitresume (void);
-UINT32 agesawrapper_amdS3Save (void);
-UINT32 agesawrapper_amds3laterestore (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

#endif
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c
index 23cdbfa..76d3209 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c
@@ -116,10 +116,7 @@ uint32_t agesawrapper_amdinitcpuio(void)
    return AGESA_SUCCESS;
 }

-UINT32
-agesawrapper_amdinitmmio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -153,13 +150,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -193,13 +187,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -225,13 +216,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -257,13 +245,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -290,7 +275,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -320,10 +305,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -350,13 +332,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -402,11 +381,10 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

/* AmdReleaseStruct (&AmdParamStruct); */
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -433,11 +411,11 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitresume(VOID)
+AGESA_STATUS agesawrapper_amdinitresume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -471,11 +449,11 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

#ifndef __PRE_RAM__
-UINT32 agesawrapper_fchs3earlyrestore (VOID)
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -499,7 +477,7 @@ UINT32 agesawrapper_fchs3earlyrestore (VOID)
 }
 #endif

-UINT32 agesawrapper_amds3laterestore (VOID)
+AGESA_STATUS agesawrapper_amds3laterestore(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS    AmdInterfaceParams;
@@ -535,14 +513,14 @@ UINT32 agesawrapper_amds3laterestore (VOID)
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__

extern UINT8 picr_data[0x54], intr_data[0x54];

-UINT32 agesawrapper_fchs3laterestore (VOID)
+AGESA_STATUS agesawrapper_fchs3laterestore(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;

@@ -579,7 +557,7 @@ UINT32 agesawrapper_fchs3laterestore (VOID)

#ifndef __PRE_RAM__

-UINT32 agesawrapper_amdS3Save(VOID)
+AGESA_STATUS agesawrapper_amdS3Save(void)
 {
    AGESA_STATUS Status;
    AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr;
@@ -635,13 +613,12 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }

#endif  /* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    UINT8 HeapStatus
    )
 {
@@ -666,5 +643,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h
index 317e5e8..0773eb9 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h
+++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h
@@ -68,22 +68,22 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
-uint32_t agesawrapper_amdinitcpuio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+uint32_t agesawrapper_amdinitcpuio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
-UINT32 agesawrapper_amdS3Save(VOID);
-UINT32 agesawrapper_amdinitresume(VOID);
-UINT32 agesawrapper_amds3laterestore (VOID);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, void *ConfigPtr);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);

-UINT32 agesawrapper_fchs3earlyrestore (VOID);
-UINT32 agesawrapper_fchs3laterestore (VOID);
+AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
+AGESA_STATUS agesawrapper_fchs3laterestore(void);

#endif
diff --git a/src/mainboard/lippert/frontrunner-af/agesawrapper.c b/src/mainboard/lippert/frontrunner-af/agesawrapper.c
index 99a32f4..4a0348d 100644
--- a/src/mainboard/lippert/frontrunner-af/agesawrapper.c
+++ b/src/mainboard/lippert/frontrunner-af/agesawrapper.c
@@ -65,8 +65,7 @@ VOID *AcpiAlib		= NULL;
  *						L O C A L		F U N C T I O N S
  *------------------------------------------------------------------------------
  */
-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    VOID
    )
 {
@@ -111,11 +110,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    VOID
    )
 {
@@ -161,11 +159,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    VOID
    )
 {
@@ -190,11 +187,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    VOID
    )
 {
@@ -219,11 +215,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    VOID
    )
 {
@@ -247,11 +242,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    VOID
    )
 {
@@ -345,7 +339,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -373,8 +367,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    VOID
    )
 {
@@ -399,11 +392,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    VOID
    )
 {
@@ -449,11 +441,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitresume (
+AGESA_STATUS agesawrapper_amdinitresume (
   VOID
   )
 {
@@ -487,11 +478,10 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amds3laterestore (
+AGESA_STATUS agesawrapper_amds3laterestore (
   VOID
   )
 {
@@ -526,12 +516,11 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__
-UINT32
-agesawrapper_amdS3Save (
+AGESA_STATUS agesawrapper_amdS3Save (
    VOID
    )
 {
@@ -580,12 +569,11 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }
 #endif	/* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -609,11 +597,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    VOID
    )
 {
@@ -634,5 +621,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/lippert/frontrunner-af/agesawrapper.h b/src/mainboard/lippert/frontrunner-af/agesawrapper.h
index 8cdb71e..93c2873 100644
--- a/src/mainboard/lippert/frontrunner-af/agesawrapper.h
+++ b/src/mainboard/lippert/frontrunner-af/agesawrapper.h
@@ -68,21 +68,21 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);

-UINT32 agesawrapper_amdreadeventlog (void);
+AGESA_STATUS agesawrapper_amdreadeventlog(void);

-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitresume (void);
-UINT32 agesawrapper_amdS3Save (void);
-UINT32 agesawrapper_amds3laterestore (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

#endif
diff --git a/src/mainboard/lippert/toucan-af/agesawrapper.c b/src/mainboard/lippert/toucan-af/agesawrapper.c
index 99a32f4..4a0348d 100644
--- a/src/mainboard/lippert/toucan-af/agesawrapper.c
+++ b/src/mainboard/lippert/toucan-af/agesawrapper.c
@@ -65,8 +65,7 @@ VOID *AcpiAlib		= NULL;
  *						L O C A L		F U N C T I O N S
  *------------------------------------------------------------------------------
  */
-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
    VOID
    )
 {
@@ -111,11 +110,10 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
    VOID
    )
 {
@@ -161,11 +159,10 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
    VOID
    )
 {
@@ -190,11 +187,10 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
    VOID
    )
 {
@@ -219,11 +215,10 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
    VOID
    )
 {
@@ -247,11 +242,10 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
    VOID
    )
 {
@@ -345,7 +339,7 @@ agesawrapper_amdinitenv (
    LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader);
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

VOID *
@@ -373,8 +367,7 @@ agesawrapper_getlateinitptr (
    }
 }

-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
    VOID
    )
 {
@@ -399,11 +392,10 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
    VOID
    )
 {
@@ -449,11 +441,10 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitresume (
+AGESA_STATUS agesawrapper_amdinitresume (
   VOID
   )
 {
@@ -487,11 +478,10 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32
-agesawrapper_amds3laterestore (
+AGESA_STATUS agesawrapper_amds3laterestore (
   VOID
   )
 {
@@ -526,12 +516,11 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

#ifndef __PRE_RAM__
-UINT32
-agesawrapper_amdS3Save (
+AGESA_STATUS agesawrapper_amdS3Save (
    VOID
    )
 {
@@ -580,12 +569,11 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

-	return (UINT32)Status;
+	return Status;
 }
 #endif	/* #ifndef __PRE_RAM__ */

-UINT32
-agesawrapper_amdlaterunaptask (
+AGESA_STATUS agesawrapper_amdlaterunaptask (
    UINT32 Func,
    UINT32 Data,
    VOID *ConfigPtr
@@ -609,11 +597,10 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
    VOID
    )
 {
@@ -634,5 +621,5 @@ agesawrapper_amdreadeventlog (
    	Status = AmdReadEventLog (&AmdEventParams);
    }

-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/lippert/toucan-af/agesawrapper.h b/src/mainboard/lippert/toucan-af/agesawrapper.h
index 8cdb71e..93c2873 100644
--- a/src/mainboard/lippert/toucan-af/agesawrapper.h
+++ b/src/mainboard/lippert/toucan-af/agesawrapper.h
@@ -68,21 +68,21 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);

-UINT32 agesawrapper_amdreadeventlog (void);
+AGESA_STATUS agesawrapper_amdreadeventlog(void);

-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdinitresume (void);
-UINT32 agesawrapper_amdS3Save (void);
-UINT32 agesawrapper_amds3laterestore (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdinitresume(void);
+AGESA_STATUS agesawrapper_amdS3Save(void);
+AGESA_STATUS agesawrapper_amds3laterestore(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);

#endif
diff --git a/src/mainboard/supermicro/h8qgi/agesawrapper.c b/src/mainboard/supermicro/h8qgi/agesawrapper.c
index ba23b4d..8ee89a7 100644
--- a/src/mainboard/supermicro/h8qgi/agesawrapper.c
+++ b/src/mainboard/supermicro/h8qgi/agesawrapper.c
@@ -78,7 +78,7 @@ VOID *AcpiAlib    = NULL;
  */
 extern VOID OemCustomizeInitEarly(IN  OUT AMD_EARLY_PARAMS *InitEarly);

-static UINT32 agesawrapper_amdinitcpuio(VOID)
+static AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS		Status;
    UINT32			PciData;
@@ -169,10 +169,10 @@ static UINT32 agesawrapper_amdinitcpuio(VOID)
    }

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitmmio(VOID)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -199,10 +199,10 @@ UINT32 agesawrapper_amdinitmmio(VOID)
    LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitreset(VOID)
+UINT32 agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -228,7 +228,7 @@ UINT32 agesawrapper_amdinitreset(VOID)
    AmdParamStruct.StdHeader.ImageBasePtr = 0;
    status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    AmdResetParams.HtConfig.Depth = 0;

@@ -241,10 +241,10 @@ UINT32 agesawrapper_amdinitreset(VOID)
    	agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct(&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitearly(VOID)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -265,7 +265,7 @@ UINT32 agesawrapper_amdinitearly(VOID)
    AmdParamStruct.StdHeader.ImageBasePtr = 0;
    status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }

AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr;
@@ -280,10 +280,10 @@ UINT32 agesawrapper_amdinitearly(VOID)
    printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);

AmdReleaseStruct(&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitpost(VOID)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -305,7 +305,7 @@ UINT32 agesawrapper_amdinitpost(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr;
    status = AmdInitPost(PostParams);
@@ -321,10 +321,10 @@ UINT32 agesawrapper_amdinitpost(VOID)
    FamilySpecificServices->GetTscRate (FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader);
    printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitenv(VOID)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -344,7 +344,7 @@ UINT32 agesawrapper_amdinitenv(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    EnvParams = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr;
    status = AmdInitEnv(EnvParams);
@@ -352,7 +352,7 @@ UINT32 agesawrapper_amdinitenv(VOID)
    	agesawrapper_amdreadeventlog(EnvParams->StdHeader.HeapStatus);

AmdReleaseStruct(&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

VOID * agesawrapper_getlateinitptr(int pick)
@@ -382,7 +382,7 @@ VOID * agesawrapper_getlateinitptr(int pick)
    return NULL;
 }

-UINT32 agesawrapper_amdinitmid(VOID)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -404,17 +404,17 @@ UINT32 agesawrapper_amdinitmid(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    status = AmdInitMid((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS)
    	agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct(&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitlate(VOID)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS		Status;
    AMD_INTERFACE_PARAMS	AmdParamStruct;
@@ -460,14 +460,14 @@ UINT32 agesawrapper_amdinitlate(VOID)
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

/**
  * @param[in] UINTN ApicIdOfCore,
  * @param[in] AP_EXE_PARAMS *LaunchApParams
  */
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
    AGESA_STATUS Status;
    AMD_LATE_PARAMS AmdLateParams;
@@ -490,7 +490,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
    	ASSERT(Status <= AGESA_UNSUPPORTED);
    }

-	return (UINT32)Status;
+	return Status;
 }

/**
@@ -1152,7 +1152,7 @@ static void interpret_agesa_eventlog(EVENT_PARAMS *event)
 /**
  * @param  HeapStatus -the current HeapStatus
  */
-UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus)
+AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus)
 {
    printk(BIOS_DEBUG, "enter in %s\n", __func__);
    AGESA_STATUS Status;
@@ -1185,5 +1185,5 @@ UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus)
    }

printk(BIOS_DEBUG, "exit %s \n", __func__);
-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/supermicro/h8qgi/agesawrapper.h b/src/mainboard/supermicro/h8qgi/agesawrapper.h
index 51e438d..c99714d 100644
--- a/src/mainboard/supermicro/h8qgi/agesawrapper.h
+++ b/src/mainboard/supermicro/h8qgi/agesawrapper.h
@@ -68,16 +68,16 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.c b/src/mainboard/supermicro/h8scm/agesawrapper.c
index ad99696..c52197b 100644
--- a/src/mainboard/supermicro/h8scm/agesawrapper.c
+++ b/src/mainboard/supermicro/h8scm/agesawrapper.c
@@ -78,7 +78,7 @@ VOID *AcpiAlib    = NULL;
  */
 extern VOID OemCustomizeInitEarly(IN  OUT AMD_EARLY_PARAMS *InitEarly);

-static UINT32 agesawrapper_amdinitcpuio(VOID)
+static AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS		Status;
    UINT32			PciData;
@@ -169,10 +169,10 @@ static UINT32 agesawrapper_amdinitcpuio(VOID)
    }

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitmmio(VOID)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -199,10 +199,10 @@ UINT32 agesawrapper_amdinitmmio(VOID)
    LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitreset(VOID)
+UINT32 agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -228,7 +228,7 @@ UINT32 agesawrapper_amdinitreset(VOID)
    AmdParamStruct.StdHeader.ImageBasePtr = 0;
    status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    AmdResetParams.HtConfig.Depth = 0;

@@ -241,10 +241,10 @@ UINT32 agesawrapper_amdinitreset(VOID)
    	agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct(&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitearly(VOID)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -265,7 +265,7 @@ UINT32 agesawrapper_amdinitearly(VOID)
    AmdParamStruct.StdHeader.ImageBasePtr = 0;
    status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }

AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr;
@@ -280,10 +280,10 @@ UINT32 agesawrapper_amdinitearly(VOID)
    printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);

AmdReleaseStruct(&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitpost(VOID)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -305,7 +305,7 @@ UINT32 agesawrapper_amdinitpost(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr;
    status = AmdInitPost(PostParams);
@@ -321,10 +321,10 @@ UINT32 agesawrapper_amdinitpost(VOID)
    FamilySpecificServices->GetTscRate (FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader);
    printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitenv(VOID)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -344,7 +344,7 @@ UINT32 agesawrapper_amdinitenv(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    EnvParams = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr;
    status = AmdInitEnv(EnvParams);
@@ -352,7 +352,7 @@ UINT32 agesawrapper_amdinitenv(VOID)
    	agesawrapper_amdreadeventlog(EnvParams->StdHeader.HeapStatus);

AmdReleaseStruct(&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

VOID * agesawrapper_getlateinitptr(int pick)
@@ -382,7 +382,7 @@ VOID * agesawrapper_getlateinitptr(int pick)
    return NULL;
 }

-UINT32 agesawrapper_amdinitmid(VOID)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -404,17 +404,17 @@ UINT32 agesawrapper_amdinitmid(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    status = AmdInitMid((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS)
    	agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct(&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitlate(VOID)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS		Status;
    AMD_INTERFACE_PARAMS	AmdParamStruct;
@@ -460,14 +460,14 @@ UINT32 agesawrapper_amdinitlate(VOID)
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

/**
  * @param[in] UINTN ApicIdOfCore,
  * @param[in] AP_EXE_PARAMS *LaunchApParams
  */
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
    AGESA_STATUS Status;
    AMD_LATE_PARAMS AmdLateParams;
@@ -490,7 +490,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
    	ASSERT(Status <= AGESA_UNSUPPORTED);
    }

-	return (UINT32)Status;
+	return Status;
 }

/**
@@ -1152,7 +1152,7 @@ static void interpret_agesa_eventlog(EVENT_PARAMS *event)
 /**
  * @param  HeapStatus -the current HeapStatus
  */
-UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus)
+AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus)
 {
    printk(BIOS_DEBUG, "enter in %s\n", __func__);
    AGESA_STATUS Status;
@@ -1185,5 +1185,5 @@ UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus)
    }

printk(BIOS_DEBUG, "exit %s \n", __func__);
-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.h b/src/mainboard/supermicro/h8scm/agesawrapper.h
index 51e438d..c99714d 100644
--- a/src/mainboard/supermicro/h8scm/agesawrapper.h
+++ b/src/mainboard/supermicro/h8scm/agesawrapper.h
@@ -68,16 +68,16 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif
diff --git a/src/mainboard/tyan/s8226/agesawrapper.c b/src/mainboard/tyan/s8226/agesawrapper.c
index 79cc826..425054c 100644
--- a/src/mainboard/tyan/s8226/agesawrapper.c
+++ b/src/mainboard/tyan/s8226/agesawrapper.c
@@ -78,7 +78,7 @@ VOID *AcpiAlib    = NULL;
  */
 extern VOID OemCustomizeInitEarly(IN  OUT AMD_EARLY_PARAMS *InitEarly);

-static UINT32 agesawrapper_amdinitcpuio(VOID)
+static AGESA_STATUS agesawrapper_amdinitcpuio(void)
 {
    AGESA_STATUS		Status;
    UINT32			PciData;
@@ -169,13 +169,10 @@ static UINT32 agesawrapper_amdinitcpuio(VOID)
    }

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32
-agesawrapper_amdinitmmio (
-	VOID
-	)
+AGESA_STATUS agesawrapper_amdinitmmio(void)
 {
    AGESA_STATUS                  Status;
    UINT64                        MsrReg;
@@ -209,10 +206,10 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

-UINT32 agesawrapper_amdinitreset(VOID)
+UINT32 agesawrapper_amdinitreset(void)
 {
    AGESA_STATUS status = AGESA_SUCCESS;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -238,7 +235,7 @@ UINT32 agesawrapper_amdinitreset(VOID)
    AmdParamStruct.StdHeader.ImageBasePtr = 0;
    status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    AmdResetParams.HtConfig.Depth = 0;

@@ -251,10 +248,10 @@ UINT32 agesawrapper_amdinitreset(VOID)
    	agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct(&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitearly(VOID)
+AGESA_STATUS agesawrapper_amdinitearly(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -275,7 +272,7 @@ UINT32 agesawrapper_amdinitearly(VOID)
    AmdParamStruct.StdHeader.ImageBasePtr = 0;
    status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }

AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *)AmdParamStruct.NewStructPtr;
@@ -290,10 +287,10 @@ UINT32 agesawrapper_amdinitearly(VOID)
    printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);

AmdReleaseStruct(&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitpost(VOID)
+AGESA_STATUS agesawrapper_amdinitpost(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS  AmdParamStruct;
@@ -315,7 +312,7 @@ UINT32 agesawrapper_amdinitpost(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr;
    status = AmdInitPost(PostParams);
@@ -331,10 +328,10 @@ UINT32 agesawrapper_amdinitpost(VOID)
    FamilySpecificServices->GetTscRate (FamilySpecificServices, &TscRateInMhz, &AmdParamStruct.StdHeader);
    printk(BIOS_DEBUG, "BSP Frequency: %uMHz\n", (unsigned int)TscRateInMhz);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitenv(VOID)
+AGESA_STATUS agesawrapper_amdinitenv(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -354,7 +351,7 @@ UINT32 agesawrapper_amdinitenv(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    EnvParams = (AMD_ENV_PARAMS *)AmdParamStruct.NewStructPtr;
    status = AmdInitEnv(EnvParams);
@@ -362,7 +359,7 @@ UINT32 agesawrapper_amdinitenv(VOID)
    	agesawrapper_amdreadeventlog(EnvParams->StdHeader.HeapStatus);

AmdReleaseStruct(&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

VOID * agesawrapper_getlateinitptr(int pick)
@@ -392,7 +389,7 @@ VOID * agesawrapper_getlateinitptr(int pick)
    return NULL;
 }

-UINT32 agesawrapper_amdinitmid(VOID)
+AGESA_STATUS agesawrapper_amdinitmid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct;
@@ -414,17 +411,17 @@ UINT32 agesawrapper_amdinitmid(VOID)

status = AmdCreateStruct(&AmdParamStruct);
    if (status != AGESA_SUCCESS) {
-		return (UINT32)status;
+		return status;
    }
    status = AmdInitMid((AMD_MID_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS)
    	agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct(&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }

-UINT32 agesawrapper_amdinitlate(VOID)
+AGESA_STATUS agesawrapper_amdinitlate(void)
 {
    AGESA_STATUS		Status;
    AMD_INTERFACE_PARAMS	AmdParamStruct;
@@ -470,14 +467,14 @@ UINT32 agesawrapper_amdinitlate(VOID)
     * AmdReleaseStruct (&AmdLateParams);
     */

-	return (UINT32)Status;
+	return Status;
 }

/**
  * @param[in] UINTN ApicIdOfCore,
  * @param[in] AP_EXE_PARAMS *LaunchApParams
  */
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
    AGESA_STATUS Status;
    AMD_LATE_PARAMS AmdLateParams;
@@ -500,7 +497,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
    	ASSERT(Status <= AGESA_UNSUPPORTED);
    }

-	return (UINT32)Status;
+	return Status;
 }

/**
@@ -1162,7 +1159,7 @@ static void interpret_agesa_eventlog(EVENT_PARAMS *event)
 /**
  * @param  HeapStatus -the current HeapStatus
  */
-UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus)
+AGESA_STATUS agesawrapper_amdreadeventlog(UINT8 HeapStatus)
 {
    printk(BIOS_DEBUG, "enter in %s\n", __func__);
    AGESA_STATUS Status;
@@ -1195,5 +1192,5 @@ UINT32 agesawrapper_amdreadeventlog(UINT8 HeapStatus)
    }

printk(BIOS_DEBUG, "exit %s \n", __func__);
-	return (UINT32)Status;
+	return Status;
 }
diff --git a/src/mainboard/tyan/s8226/agesawrapper.h b/src/mainboard/tyan/s8226/agesawrapper.h
index 51e438d..c99714d 100644
--- a/src/mainboard/tyan/s8226/agesawrapper.h
+++ b/src/mainboard/tyan/s8226/agesawrapper.h
@@ -68,16 +68,16 @@ enum {
  *---------------------------------------------------------------------------------------
  */

-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
-UINT32 agesawrapper_amdreadeventlog (UINT8 HeapStatus);
-UINT32 agesawrapper_amdinitmmio (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
+AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
 void *agesawrapper_getlateinitptr (int pick);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);

-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif