From 7eb363c505f26aa8cc0a30f5b6c0229ca8914489 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 16 Oct 2017 14:55:53 -0600 Subject: Stoney Ridge Platforms: cast AGESA tables to void * In the original AGESA headers, these tables are not defined as const. Cast them to void * so that they'll work with either version of the headers. BUG=b:64766233 TEST=Build in cros tree and upstream coreboot, with old headers and updated headers. Change-Id: I75387b57caf5a3c6c25655120aafd942254b5c73 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/22059 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/mainboard/google/kahlee/bootblock/BiosCallOuts.c | 2 +- src/mainboard/google/kahlee/bootblock/OemCustomize.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mainboard/google/kahlee/bootblock') diff --git a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c b/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c index 73d129594d..3ca3c6f9e7 100644 --- a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c +++ b/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c @@ -23,5 +23,5 @@ extern const GPIO_CONTROL oem_kahlee_gpio[]; void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset) { - FchParams_reset->EarlyOemGpioTable = oem_kahlee_gpio; + FchParams_reset->EarlyOemGpioTable = (void *)oem_kahlee_gpio; } diff --git a/src/mainboard/google/kahlee/bootblock/OemCustomize.c b/src/mainboard/google/kahlee/bootblock/OemCustomize.c index 38d08e553f..9530169edc 100644 --- a/src/mainboard/google/kahlee/bootblock/OemCustomize.c +++ b/src/mainboard/google/kahlee/bootblock/OemCustomize.c @@ -101,8 +101,8 @@ static const PCIe_DDI_DESCRIPTOR DdiList[] = { static const PCIe_COMPLEX_DESCRIPTOR PcieComplex = { .Flags = DESCRIPTOR_TERMINATE_LIST, .SocketId = 0, - .PciePortList = PortList, - .DdiLinkList = DdiList + .PciePortList = (void *)PortList, + .DdiLinkList = (void *)DdiList }; /*---------------------------------------------------------------------------*/ @@ -123,7 +123,7 @@ static const PCIe_COMPLEX_DESCRIPTOR PcieComplex = { /*---------------------------------------------------------------------------*/ VOID OemCustomizeInitEarly(IN OUT AMD_EARLY_PARAMS *InitEarly) { - InitEarly->GnbConfig.PcieComplexList = &PcieComplex; + InitEarly->GnbConfig.PcieComplexList = (void *)&PcieComplex; InitEarly->PlatformConfig.GnbAzI2sBusSelect = GnbAcpI2sBus; InitEarly->PlatformConfig.GnbAzI2sBusPinConfig = GnbAcp2Tx4RxBluetooth; } -- cgit v1.2.3