Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6181
-gerrit
commit 3de215fac604a714707ac11841925baf2cbe5a2b Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Sun May 4 08:53:51 2014 +0300
jetway/nf81-t56n-lf: Revert change on function prototypes
These function prototypes need to remain identical across all AGESA families.
Change-Id: Ic88718cf0e09a23e0e2f25f05cad5120094f0b8d Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c | 52 ++++++++++++------------ src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h | 30 +++++++------- 2 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c index ed70fc8..c6aaffb 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c +++ b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.c @@ -46,7 +46,7 @@ void *AcpiWheaMce = NULL; void *AcpiWheaCmc = NULL; void *AcpiAlib = NULL;
-AGESA_STATUS agesawrapper_amdinitcpuio(void) +UINT32 agesawrapper_amdinitcpuio(void) { pci_devfn_t dev; msr_t msr; @@ -78,10 +78,10 @@ AGESA_STATUS agesawrapper_amdinitcpuio(void) pci_io_write_config32(dev, 0xc4, 0x0000f000); pci_io_write_config32(dev, 0xc0, 0x00000003);
- return AGESA_SUCCESS; + return (UINT32)AGESA_SUCCESS; }
-AGESA_STATUS agesawrapper_amdinitmmio(void) +UINT32 agesawrapper_amdinitmmio(void) { uint64_t MsrReg; uint32_t PciData; @@ -123,10 +123,10 @@ AGESA_STATUS agesawrapper_amdinitmmio(void) PciData = (AMD_APU_SSID<<0x10)|AMD_APU_SVID; LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
- return AGESA_SUCCESS; + return (UINT32)AGESA_SUCCESS; }
-AGESA_STATUS agesawrapper_amdinitreset(void) +UINT32 agesawrapper_amdinitreset(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -150,10 +150,10 @@ AGESA_STATUS agesawrapper_amdinitreset(void) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return status; + return (UINT32)status; }
-AGESA_STATUS agesawrapper_amdinitearly(void) +UINT32 agesawrapper_amdinitearly(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -176,10 +176,10 @@ AGESA_STATUS agesawrapper_amdinitearly(void) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return status; + return (UINT32)status; }
-AGESA_STATUS agesawrapper_amdinitpost(void) +UINT32 agesawrapper_amdinitpost(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -201,10 +201,10 @@ AGESA_STATUS agesawrapper_amdinitpost(void) /* Initialize heap space */ EmptyHeap();
- return status; + return (UINT32)status; }
-AGESA_STATUS agesawrapper_amdinitenv(void) +UINT32 agesawrapper_amdinitenv(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -296,7 +296,7 @@ AGESA_STATUS agesawrapper_amdinitenv(void) LibAmdPciWrite (AccessWidth32, PciAddress, &PciValue, &AmdParamStruct.StdHeader); AmdReleaseStruct (&AmdParamStruct);
- return status; + return (UINT32)status; }
void * agesawrapper_getlateinitptr(int pick) @@ -321,7 +321,7 @@ void * agesawrapper_getlateinitptr(int pick) } }
-AGESA_STATUS agesawrapper_amdinitmid(void) +UINT32 agesawrapper_amdinitmid(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -344,10 +344,10 @@ AGESA_STATUS agesawrapper_amdinitmid(void) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return status; + return (UINT32)status; }
-AGESA_STATUS agesawrapper_amdinitlate(void) +UINT32 agesawrapper_amdinitlate(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -391,10 +391,10 @@ AGESA_STATUS agesawrapper_amdinitlate(void) * AmdReleaseStruct (&AmdLateParams); */
- return status; + return (UINT32)status; }
-AGESA_STATUS agesawrapper_amdinitresume(void) +UINT32 agesawrapper_amdinitresume(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdParamStruct; @@ -426,10 +426,10 @@ AGESA_STATUS agesawrapper_amdinitresume(void) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(); AmdReleaseStruct (&AmdParamStruct);
- return status; + return (UINT32)status; }
-AGESA_STATUS agesawrapper_amds3laterestore(void) +UINT32 agesawrapper_amds3laterestore(void) { AGESA_STATUS status; AMD_INTERFACE_PARAMS AmdInterfaceParams; @@ -462,11 +462,11 @@ AGESA_STATUS agesawrapper_amds3laterestore(void) ASSERT(status == AGESA_SUCCESS); }
- return status; + return (UINT32)status; }
#ifndef __PRE_RAM__ -AGESA_STATUS agesawrapper_amdS3Save(void) +UINT32 agesawrapper_amdS3Save(void) { AGESA_STATUS status; AMD_S3SAVE_PARAMS *AmdS3SaveParamsPtr; @@ -513,11 +513,11 @@ AGESA_STATUS agesawrapper_amdS3Save(void) OemAgesaSaveMtrr(); AmdReleaseStruct (&AmdInterfaceParams);
- return status; + return (UINT32)status; } #endif /* #ifndef __PRE_RAM__ */
-AGESA_STATUS agesawrapper_amdlaterunaptask ( +UINT32 agesawrapper_amdlaterunaptask ( uint32_t Func, uint32_t Data, void *ConfigPtr @@ -541,10 +541,10 @@ AGESA_STATUS agesawrapper_amdlaterunaptask ( ASSERT(status == AGESA_SUCCESS); }
- return status; + return (UINT32)status; }
-AGESA_STATUS agesawrapper_amdreadeventlog(void) +UINT32 agesawrapper_amdreadeventlog(void) { AGESA_STATUS status; EVENT_PARAMS AmdEventParams; @@ -563,5 +563,5 @@ AGESA_STATUS agesawrapper_amdreadeventlog(void) status = AmdReadEventLog (&AmdEventParams); }
- return status; + return (UINT32)status; } diff --git a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h index 720f3be..180ebc7 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h +++ b/src/mainboard/jetway/nf81-t56n-lf/agesawrapper.h @@ -42,21 +42,21 @@ enum { };
-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_t, uint32_t, 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_amdinitcpuio(void); +UINT32 agesawrapper_amdinitmmio(void); +UINT32 agesawrapper_amdinitresume(void); +UINT32 agesawrapper_amdS3Save(void); +UINT32 agesawrapper_amds3laterestore(void); +UINT32 agesawrapper_amdlaterunaptask(uint32_t, uint32_t, void *); void * agesawrapper_getlateinitptr(int);
#endif /* _AGESAWRAPPER_H_ */