soc/intel/skylake: Fix compilation under x86_64
Change-Id: I37382ab06a8f1760e955d1ec76a6a00958b05999
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48177
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 743b33f..98d9313 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -169,7 +169,7 @@
#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 @@
/* 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 ad75f02..2f0fd97 100644
--- a/src/soc/intel/skylake/irq.c
+++ b/src/soc/intel/skylake/irq.c
@@ -175,7 +175,7 @@
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;