diff options
| author | Richard Spiegel <richard.spiegel@amd.corp-partner.google.com> | 2018-11-06 16:32:28 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-11-16 09:43:32 +0000 |
| commit | 271b8a5f81b2363218eb8768754001bd4658c92b (patch) | |
| tree | 86965633d1f582a45b626f6d18bfb129be4f1542 /src/soc/amd/stoneyridge | |
| parent | 509d99ca6b34de7909ca944584b613b547a58e34 (diff) | |
soc/amd: Convert from AMD units to coreboot units
There are several files under soc/amd that use units defined by file
porting.h. These units use upper case, and are not recognized by checkpatch,
thus causing problems when defining a pointer (request to use space before
and after the star symbol). These are the definitions from porting.h showing
the units that this patch will change and their coreboot definitions (not all
are actually used):
typedef uintptr_t UINTN;
typedef int64_t INT64;
typedef uint64_t UINT64;
typedef int32_t INT32;
typedef uint32_t UINT32;
typedef int16_t INT16;
typedef uint16_t UINT16;
typedef int8_t INT8;
typedef uint8_t UINT8;
typedef char CHAR8;
typedef unsigned short CHAR16;
typedef unsigned char BOOLEAN;
typedef void VOID;
BUG=b:118775313
TEST=Build and boot grunt.
Change-Id: Ic1bd64d6224a030a65d23decabf0e602cee02871
Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/29520
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/soc/amd/stoneyridge')
| -rw-r--r-- | src/soc/amd/stoneyridge/BiosCallOuts.c | 13 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/northbridge.c | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/soc/amd/stoneyridge/BiosCallOuts.c b/src/soc/amd/stoneyridge/BiosCallOuts.c index 5e6c899268..fdef166c62 100644 --- a/src/soc/amd/stoneyridge/BiosCallOuts.c +++ b/src/soc/amd/stoneyridge/BiosCallOuts.c @@ -27,10 +27,10 @@ #include "chip.h" #include <amdblocks/car.h> -void __weak platform_FchParams_reset( - FCH_RESET_DATA_BLOCK *FchParams_reset) {} +void __weak platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset) {} -AGESA_STATUS agesa_fch_initreset(UINT32 Func, UINTN FchData, VOID *ConfigPtr) +AGESA_STATUS agesa_fch_initreset(uint32_t Func, uintptr_t FchData, + void *ConfigPtr) { AMD_CONFIG_PARAMS *StdHeader = ConfigPtr; @@ -48,7 +48,8 @@ AGESA_STATUS agesa_fch_initreset(UINT32 Func, UINTN FchData, VOID *ConfigPtr) return AGESA_SUCCESS; } -AGESA_STATUS agesa_fch_initenv(UINT32 Func, UINTN FchData, VOID *ConfigPtr) +AGESA_STATUS agesa_fch_initenv(uint32_t Func, uintptr_t FchData, + void *ConfigPtr) { AMD_CONFIG_PARAMS *StdHeader = ConfigPtr; const struct device *dev = dev_find_slot(0, SATA_DEVFN); @@ -92,7 +93,7 @@ AGESA_STATUS agesa_fch_initenv(UINT32 Func, UINTN FchData, VOID *ConfigPtr) return AGESA_SUCCESS; } -AGESA_STATUS agesa_ReadSpd(UINT32 Func, UINTN Data, VOID *ConfigPtr) +AGESA_STATUS agesa_ReadSpd(uint32_t Func, uintptr_t Data, void *ConfigPtr) { uint8_t spd_address; int err; @@ -137,7 +138,7 @@ AGESA_STATUS agesa_ReadSpd(UINT32 Func, UINTN Data, VOID *ConfigPtr) return AGESA_SUCCESS; } -AGESA_STATUS agesa_HaltThisAp(UINT32 Func, UINTN Data, VOID *ConfigPtr) +AGESA_STATUS agesa_HaltThisAp(uint32_t Func, uintptr_t Data, void *ConfigPtr) { AGESA_HALT_THIS_AP_PARAMS *info = ConfigPtr; uint32_t flags = 0; diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index e95e8ec181..749eefe1b7 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -186,12 +186,12 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest) addr = agesawrapper_getlateinitptr(PICK_WHEA_MCE); if (addr != NULL) current += acpi_create_hest_error_source(hest, current, 0, - (void *)((u32)addr + 2), *(UINT16 *)addr - 2); + (void *)((u32)addr + 2), *(uint16_t *)addr - 2); addr = agesawrapper_getlateinitptr(PICK_WHEA_CMC); if (addr != NULL) current += acpi_create_hest_error_source(hest, current, 1, - (void *)((u32)addr + 2), *(UINT16 *)addr - 2); + (void *)((u32)addr + 2), *(uint16_t *)addr - 2); return (unsigned long)current; } |