From 03a339126b35341b3b1baa85e596602a7facb1ed Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Mon, 30 Nov 2020 17:45:42 +0100 Subject: [PATCH] soc/intel/skylake: Fix compilation under x86_64 Change-Id: I37382ab06a8f1760e955d1ec76a6a00958b05999 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/c/coreboot/+/48177 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/soc/intel/skylake/acpi.c | 4 ++-- src/soc/intel/skylake/irq.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 743b33f9ae..98d93135ad 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -169,7 +169,7 @@ void acpi_create_gnvs(struct global_nvs *gnvs) #if CONFIG(CONSOLE_CBMEM) /* Update the mem console pointer. */ - gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE); + gnvs->cbmc = (u32)(uintptr_t)cbmem_find(CBMEM_ID_CONSOLE); #endif if (CONFIG(CHROMEOS)) { @@ -554,7 +554,7 @@ void southbridge_inject_dsdt(const struct device *device) /* Add it to DSDT. */ acpigen_write_scope("\\"); - acpigen_write_name_dword("NVSA", (u32) gnvs); + acpigen_write_name_dword("NVSA", (u32) (uintptr_t)gnvs); acpigen_pop_len(); } } diff --git a/src/soc/intel/skylake/irq.c b/src/soc/intel/skylake/irq.c index ad75f027a1..2f0fd97a77 100644 --- a/src/soc/intel/skylake/irq.c +++ b/src/soc/intel/skylake/irq.c @@ -175,7 +175,7 @@ void soc_irq_settings(FSP_SIL_UPD *params) intdeventry = ARRAY_SIZE(devintconfig); /* update irq table */ memcpy((SI_PCH_DEVICE_INTERRUPT_CONFIG *) - (params->DevIntConfigPtr), devintconfig, intdeventry * + (uintptr_t)(params->DevIntConfigPtr), devintconfig, intdeventry * sizeof(SI_PCH_DEVICE_INTERRUPT_CONFIG)); params->NumOfDevIntConfig = intdeventry;