[coreboot-gerrit] New patch to review for coreboot: 4353c75 AGESA: Fix error status code return type to enum from UINT32

[Edward O'Callaghan]

Edward O'Callaghan ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6182

-gerrit

commit 4353c75308a414b938d47110de56f848bd6c09f0
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 where as boards use a
    mess of UINT32 typecasts.

Change-Id: I16ccfcc73cda6b917c7ff5fd42ee2cd04e7dc0dd
    Signed-off-by: Edward O'Callaghan 
---
 src/mainboard/amd/dinar/agesawrapper.c             | 22 +++++-----
 src/mainboard/amd/dinar/agesawrapper.h             | 20 ++++-----
 src/mainboard/amd/inagua/agesawrapper.c            | 20 ++++-----
 src/mainboard/amd/inagua/agesawrapper.h            | 26 ++++++------
 src/mainboard/amd/olivehill/agesawrapper.c         | 32 +++++++--------
 src/mainboard/amd/olivehill/agesawrapper.h         | 26 ++++++------
 src/mainboard/amd/parmer/agesawrapper.c            | 32 +++++++--------
 src/mainboard/amd/parmer/agesawrapper.h            | 26 ++++++------
 src/mainboard/amd/persimmon/agesawrapper.c         | 26 ++++++------
 src/mainboard/amd/persimmon/agesawrapper.h         | 30 +++++++-------
 src/mainboard/amd/south_station/agesawrapper.c     | 20 ++++-----
 src/mainboard/amd/south_station/agesawrapper.h     | 26 ++++++------
 src/mainboard/amd/thatcher/agesawrapper.c          | 32 +++++++--------
 src/mainboard/amd/thatcher/agesawrapper.h          | 26 ++++++------
 src/mainboard/amd/torpedo/agesawrapper.c           | 22 +++++-----
 src/mainboard/amd/torpedo/agesawrapper.h           | 22 +++++-----
 src/mainboard/amd/union_station/agesawrapper.c     | 20 ++++-----
 src/mainboard/amd/union_station/agesawrapper.h     | 26 ++++++------
 src/mainboard/asrock/e350m1/agesawrapper.c         | 20 ++++-----
 src/mainboard/asrock/e350m1/agesawrapper.h         | 22 +++++-----
 src/mainboard/asrock/imb-a180/agesawrapper.c       | 32 +++++++--------
 src/mainboard/asrock/imb-a180/agesawrapper.h       | 26 ++++++------
 src/mainboard/asus/f2a85-m/agesawrapper.c          | 32 +++++++--------
 src/mainboard/asus/f2a85-m/agesawrapper.h          | 26 ++++++------
 src/mainboard/gizmosphere/gizmo/agesawrapper.c     | 26 ++++++------
 src/mainboard/gizmosphere/gizmo/agesawrapper.h     | 26 ++++++------
 src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c | 30 +++++++-------
 src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h | 24 +++++------
 .../lippert/frontrunner-af/agesawrapper.c          | 26 ++++++------
 .../lippert/frontrunner-af/agesawrapper.h          | 26 ++++++------
 src/mainboard/lippert/toucan-af/agesawrapper.c     | 26 ++++++------
 src/mainboard/lippert/toucan-af/agesawrapper.h     | 26 ++++++------
 src/mainboard/supermicro/h8qgi/agesawrapper.c      | 48 +++++++++++-----------
 src/mainboard/supermicro/h8qgi/agesawrapper.h      | 20 ++++-----
 src/mainboard/supermicro/h8scm/agesawrapper.c      | 48 +++++++++++-----------
 src/mainboard/supermicro/h8scm/agesawrapper.h      | 20 ++++-----
 src/mainboard/tyan/s8226/agesawrapper.c            | 46 ++++++++++-----------
 src/mainboard/tyan/s8226/agesawrapper.h            | 20 ++++-----
 38 files changed, 512 insertions(+), 512 deletions(-)

diff --git a/src/mainboard/amd/dinar/agesawrapper.c b/src/mainboard/amd/dinar/agesawrapper.c
index f8a5803..ce67552 100644
--- a/src/mainboard/amd/dinar/agesawrapper.c
+++ b/src/mainboard/amd/dinar/agesawrapper.c
@@ -195,7 +195,7 @@ static UINT32 amdinitcpuio(VOID)
    	LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    }
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -248,7 +248,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20F, &MsrReg, &StdHeader);

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

UINT32
@@ -291,7 +291,7 @@ agesawrapper_amdinitreset (
    status = AGESA_SUCCESS;
 #endif

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

UINT32
@@ -323,7 +323,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

-	return (UINT32)status;
+	return status;
 }
 /**
  *  OemCustomizeInitEarly
@@ -386,7 +386,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

UINT32
@@ -413,7 +413,7 @@ agesawrapper_amdinitenv (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

VOID *
@@ -474,7 +474,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -526,10 +526,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,7 +550,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -578,5 +578,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..005b2ea 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..f82c901 100644
--- a/src/mainboard/amd/inagua/agesawrapper.c
+++ b/src/mainboard/amd/inagua/agesawrapper.c
@@ -93,7 +93,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -143,7 +143,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -172,7 +172,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

UINT32
@@ -201,7 +201,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -229,7 +229,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -381,7 +381,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -431,7 +431,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -459,7 +459,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -484,5 +484,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..df8f2b1 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..e5d493c 100644
--- a/src/mainboard/amd/olivehill/agesawrapper.c
+++ b/src/mainboard/amd/olivehill/agesawrapper.c
@@ -102,7 +102,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -142,7 +142,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

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

UINT32
@@ -182,7 +182,7 @@ 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
@@ -214,7 +214,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -246,7 +246,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

UINT32
@@ -279,7 +279,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

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

VOID *
@@ -339,7 +339,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -391,7 +391,7 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

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

UINT32
@@ -422,11 +422,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,7 +460,7 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

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

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

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

#ifndef __PRE_RAM__
@@ -566,7 +566,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,7 +622,7 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

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

#endif  /* #ifndef __PRE_RAM__ */
@@ -653,5 +653,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..b7e705d 100644
--- a/src/mainboard/amd/olivehill/agesawrapper.h
+++ b/src/mainboard/amd/olivehill/agesawrapper.h
@@ -40,20 +40,20 @@ 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);
diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c
index 85c1474..2e54039 100644
--- a/src/mainboard/amd/parmer/agesawrapper.c
+++ b/src/mainboard/amd/parmer/agesawrapper.c
@@ -102,7 +102,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -142,7 +142,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

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

UINT32
@@ -182,7 +182,7 @@ 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
@@ -214,7 +214,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -247,7 +247,7 @@ agesawrapper_amdinitpost (
    EmptyHeap();

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

UINT32
@@ -280,7 +280,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

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

VOID *
@@ -340,7 +340,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -392,7 +392,7 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

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

UINT32
@@ -423,11 +423,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,7 +461,7 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

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

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

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

#ifndef __PRE_RAM__
@@ -569,7 +569,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,7 +625,7 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

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

#endif  /* #ifndef __PRE_RAM__ */
@@ -656,5 +656,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..b7e705d 100644
--- a/src/mainboard/amd/parmer/agesawrapper.h
+++ b/src/mainboard/amd/parmer/agesawrapper.h
@@ -40,20 +40,20 @@ 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);
diff --git a/src/mainboard/amd/persimmon/agesawrapper.c b/src/mainboard/amd/persimmon/agesawrapper.c
index cfd0eee..a3f0676 100644
--- a/src/mainboard/amd/persimmon/agesawrapper.c
+++ b/src/mainboard/amd/persimmon/agesawrapper.c
@@ -92,7 +92,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -142,7 +142,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -171,7 +171,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

UINT32
@@ -200,7 +200,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -228,7 +228,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -380,7 +380,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -430,7 +430,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -468,7 +468,7 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -507,7 +507,7 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

#ifndef __PRE_RAM__
@@ -561,7 +561,7 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

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

@@ -590,7 +590,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -615,5 +615,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..97c1246 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..d53e317 100644
--- a/src/mainboard/amd/south_station/agesawrapper.c
+++ b/src/mainboard/amd/south_station/agesawrapper.c
@@ -93,7 +93,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -143,7 +143,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -172,7 +172,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
  }

UINT32
@@ -201,7 +201,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -229,7 +229,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -381,7 +381,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -426,7 +426,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -454,7 +454,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -479,5 +479,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..ec731ad 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..972cbd4 100644
--- a/src/mainboard/amd/thatcher/agesawrapper.c
+++ b/src/mainboard/amd/thatcher/agesawrapper.c
@@ -102,7 +102,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -142,7 +142,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

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

UINT32
@@ -180,7 +180,7 @@ 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
@@ -212,7 +212,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -244,7 +244,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

UINT32
@@ -277,7 +277,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

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

VOID *
@@ -337,7 +337,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -389,7 +389,7 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

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

UINT32
@@ -420,11 +420,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,7 +460,7 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

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

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

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

#ifndef __PRE_RAM__
@@ -568,7 +568,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,7 +627,7 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

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

#endif  /* #ifndef __PRE_RAM__ */
@@ -658,5 +658,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..b7e705d 100644
--- a/src/mainboard/amd/thatcher/agesawrapper.h
+++ b/src/mainboard/amd/thatcher/agesawrapper.h
@@ -40,20 +40,20 @@ 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);
diff --git a/src/mainboard/amd/torpedo/agesawrapper.c b/src/mainboard/amd/torpedo/agesawrapper.c
index 556c2a8..7872184 100644
--- a/src/mainboard/amd/torpedo/agesawrapper.c
+++ b/src/mainboard/amd/torpedo/agesawrapper.c
@@ -195,7 +195,7 @@ agesawrapper_amdinitcpuio (
   PciData = 0x00000013;
   LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
   Status = AGESA_SUCCESS;
-  return (UINT32)Status;
+  return Status;
 }

UINT32
@@ -259,7 +259,7 @@ agesawrapper_amdinitmmio (
 //-  ClearAllSmiEnableInPmio ();

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

UINT32
@@ -296,7 +296,7 @@ agesawrapper_amdinitreset (
   status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);
-  return (UINT32)status;
+  return status;
  }

UINT32
@@ -328,7 +328,7 @@ agesawrapper_amdinitearly (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -359,7 +359,7 @@ agesawrapper_amdinitpost (
   /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -446,7 +446,7 @@ agesawrapper_amdinitmid (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -482,10 +482,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,7 +506,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
     ASSERT(Status == AGESA_SUCCESS);
   }

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

UINT32
@@ -534,5 +534,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..69f986c 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..d53e317 100644
--- a/src/mainboard/amd/union_station/agesawrapper.c
+++ b/src/mainboard/amd/union_station/agesawrapper.c
@@ -93,7 +93,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -143,7 +143,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -172,7 +172,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
  }

UINT32
@@ -201,7 +201,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -229,7 +229,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -381,7 +381,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -426,7 +426,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -454,7 +454,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -479,5 +479,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..ec731ad 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..c0d39da 100644
--- a/src/mainboard/asrock/e350m1/agesawrapper.c
+++ b/src/mainboard/asrock/e350m1/agesawrapper.c
@@ -122,7 +122,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -172,7 +172,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -201,7 +201,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
  }

UINT32
@@ -230,7 +230,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -258,7 +258,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -410,7 +410,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -455,7 +455,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -483,7 +483,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -508,5 +508,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..6d14b67 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..d81eab5 100644
--- a/src/mainboard/asrock/imb-a180/agesawrapper.c
+++ b/src/mainboard/asrock/imb-a180/agesawrapper.c
@@ -131,7 +131,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -171,7 +171,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

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

UINT32
@@ -211,7 +211,7 @@ 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
@@ -243,7 +243,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -275,7 +275,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

UINT32
@@ -308,7 +308,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

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

VOID *
@@ -368,7 +368,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -420,7 +420,7 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

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

UINT32
@@ -451,11 +451,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,7 +489,7 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

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

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

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

#ifndef __PRE_RAM__
@@ -595,7 +595,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,7 +651,7 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

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

#endif  /* #ifndef __PRE_RAM__ */
@@ -682,5 +682,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..36923ff 100644
--- a/src/mainboard/asrock/imb-a180/agesawrapper.h
+++ b/src/mainboard/asrock/imb-a180/agesawrapper.h
@@ -69,20 +69,20 @@ 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);
diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.c b/src/mainboard/asus/f2a85-m/agesawrapper.c
index 2a3502a..f7410db 100644
--- a/src/mainboard/asus/f2a85-m/agesawrapper.c
+++ b/src/mainboard/asus/f2a85-m/agesawrapper.c
@@ -122,7 +122,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -155,7 +155,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

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

UINT32
@@ -195,7 +195,7 @@ 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
@@ -227,7 +227,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -259,7 +259,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

UINT32
@@ -292,7 +292,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

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

VOID *
@@ -352,7 +352,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -404,7 +404,7 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

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

UINT32
@@ -435,11 +435,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,7 +475,7 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

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

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

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

#ifndef __PRE_RAM__
@@ -583,7 +583,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,7 +642,7 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

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

#endif  /* #ifndef __PRE_RAM__ */
@@ -673,5 +673,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..a82952c 100644
--- a/src/mainboard/asus/f2a85-m/agesawrapper.h
+++ b/src/mainboard/asus/f2a85-m/agesawrapper.h
@@ -68,20 +68,20 @@ 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);
diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.c b/src/mainboard/gizmosphere/gizmo/agesawrapper.c
index 4b29128..09da203 100755
--- a/src/mainboard/gizmosphere/gizmo/agesawrapper.c
+++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.c
@@ -112,7 +112,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -162,7 +162,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -191,7 +191,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

UINT32
@@ -220,7 +220,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -248,7 +248,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -400,7 +400,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -450,7 +450,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -488,7 +488,7 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -527,7 +527,7 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

#ifndef __PRE_RAM__
@@ -581,7 +581,7 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

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

@@ -610,7 +610,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -635,5 +635,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..f0cb3b0 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..053da85 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.c
@@ -153,7 +153,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

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

UINT32
@@ -193,7 +193,7 @@ 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
@@ -225,7 +225,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -257,7 +257,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

UINT32
@@ -290,7 +290,7 @@ agesawrapper_amdinitenv (
     Modify D1F0x18
    */

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

VOID *
@@ -350,7 +350,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -402,7 +402,7 @@ agesawrapper_amdinitlate (
           (unsigned int)AcpiAlib, (unsigned int)AcpiIvrs, __func__);

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

UINT32
@@ -433,11 +433,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,7 +471,7 @@ UINT32 agesawrapper_amdinitresume(VOID)
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
    AmdReleaseStruct (&AmdParamStruct);

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

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

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

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

#ifndef __PRE_RAM__
@@ -579,7 +579,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,7 +635,7 @@ UINT32 agesawrapper_amdS3Save(VOID)

AmdReleaseStruct (&AmdInterfaceParams);

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

#endif  /* #ifndef __PRE_RAM__ */
@@ -666,5 +666,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..a18b7b0 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h
+++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h
@@ -68,20 +68,20 @@ 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);
 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);
diff --git a/src/mainboard/lippert/frontrunner-af/agesawrapper.c b/src/mainboard/lippert/frontrunner-af/agesawrapper.c
index 99a32f4..b9a8405 100644
--- a/src/mainboard/lippert/frontrunner-af/agesawrapper.c
+++ b/src/mainboard/lippert/frontrunner-af/agesawrapper.c
@@ -111,7 +111,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -161,7 +161,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -190,7 +190,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

UINT32
@@ -219,7 +219,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -247,7 +247,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -399,7 +399,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -449,7 +449,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -487,7 +487,7 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -526,7 +526,7 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

#ifndef __PRE_RAM__
@@ -580,7 +580,7 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

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

@@ -609,7 +609,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -634,5 +634,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..58ce4cb 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..b9a8405 100644
--- a/src/mainboard/lippert/toucan-af/agesawrapper.c
+++ b/src/mainboard/lippert/toucan-af/agesawrapper.c
@@ -111,7 +111,7 @@ agesawrapper_amdinitcpuio (
    PciData = 0x00000003;
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
    Status = AGESA_SUCCESS;
-	return (UINT32)Status;
+	return Status;
 }

UINT32
@@ -161,7 +161,7 @@ agesawrapper_amdinitmmio (
    LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);

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

UINT32
@@ -190,7 +190,7 @@ agesawrapper_amdinitreset (
    status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);
-	return (UINT32)status;
+	return status;
 }

UINT32
@@ -219,7 +219,7 @@ agesawrapper_amdinitearly (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -247,7 +247,7 @@ agesawrapper_amdinitpost (
    /* Initialize heap space */
    EmptyHeap();

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

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

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

VOID *
@@ -399,7 +399,7 @@ agesawrapper_amdinitmid (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -449,7 +449,7 @@ agesawrapper_amdinitlate (
     * AmdReleaseStruct (&AmdLateParams);
     */

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

UINT32
@@ -487,7 +487,7 @@ agesawrapper_amdinitresume (
    if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
    AmdReleaseStruct (&AmdParamStruct);

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

UINT32
@@ -526,7 +526,7 @@ agesawrapper_amds3laterestore (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

#ifndef __PRE_RAM__
@@ -580,7 +580,7 @@ agesawrapper_amdS3Save (
    OemAgesaSaveMtrr();
    AmdReleaseStruct (&AmdInterfaceParams);

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

@@ -609,7 +609,7 @@ agesawrapper_amdlaterunaptask (
    	ASSERT(Status == AGESA_SUCCESS);
    }

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

UINT32
@@ -634,5 +634,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..58ce4cb 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 95fcece..24e3ee7 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,7 +199,7 @@ UINT32 agesawrapper_amdinitmmio(VOID)
    LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);

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

UINT32 agesawrapper_amdinitreset(VOID)
@@ -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,6 +1185,6 @@ 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..17de116 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 e26dc75..9679fd9 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,7 +199,7 @@ UINT32 agesawrapper_amdinitmmio(VOID)
    LibAmdMsrWrite(0x20D, &MsrReg, &StdHeader);

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

UINT32 agesawrapper_amdinitreset(VOID)
@@ -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,6 +1185,6 @@ 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..17de116 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 0a68979..2f5994b 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,7 +169,7 @@ static UINT32 agesawrapper_amdinitcpuio(VOID)
    }

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

UINT32
@@ -209,7 +209,7 @@ agesawrapper_amdinitmmio (
    LibAmdMsrWrite (0x20D, &MsrReg, &StdHeader);

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

UINT32 agesawrapper_amdinitreset(VOID)
@@ -238,7 +238,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 +251,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 +275,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 +290,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 +315,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 +331,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 +354,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 +362,7 @@ UINT32 agesawrapper_amdinitenv(VOID)
    	agesawrapper_amdreadeventlog(EnvParams->StdHeader.HeapStatus);

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

VOID * agesawrapper_getlateinitptr(int pick)
@@ -392,7 +392,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 +414,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 +470,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 +500,7 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
    	ASSERT(Status <= AGESA_UNSUPPORTED);
    }

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

/**
@@ -1162,7 +1162,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,6 +1195,6 @@ 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..17de116 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