Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/81380?usp=email )
Change subject: mb/google/butterfly: Fix compiling for 64bit mode ......................................................................
mb/google/butterfly: Fix compiling for 64bit mode
Change-Id: Ieaaba5b36796d97449896b8475744a21f01e93d1 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/81380 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/mainboard/google/butterfly/mainboard.c 1 file changed, 4 insertions(+), 4 deletions(-)
Approvals: Patrick Rudolph: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c index ac0f57b..988c210 100644 --- a/src/mainboard/google/butterfly/mainboard.c +++ b/src/mainboard/google/butterfly/mainboard.c @@ -49,7 +49,7 @@ }
static int get_mac_address(u32 *high_dword, u32 *low_dword, - u32 search_address, u32 search_length) + uintptr_t search_address, u32 search_length) { char key[] = "ethernet_mac"; unsigned int offset; @@ -118,7 +118,7 @@ } }
-static void program_keyboard_type(u32 search_address, u32 search_length) +static void program_keyboard_type(uintptr_t search_address, u32 search_length) { char key[] = "keyboard_layout"; char kbd_jpn[] = "xkb:jp::jpn"; @@ -160,7 +160,7 @@
static void mainboard_init(struct device *dev) { - u32 search_address = 0x0; + uintptr_t search_address = 0x0; size_t search_length = -1; u16 io_base = 0; struct device *ethernet_dev = NULL; @@ -180,7 +180,7 @@ } else { vpd_file = cbfs_map("vpd.bin", &search_length); if (vpd_file) { - search_address = (unsigned long)vpd_file; + search_address = (uintptr_t)vpd_file; } else { search_length = -1; search_address = 0;