sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/butterfly: Fix compiling for 64bit mode

Browse Source 
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>
This commit is contained in:
Arthur Heymans
2024-03-21 14:00:02 +01:00
committed by Martin L Roth
parent d603f7c3fa
commit 2095aedba8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mainboard/google/butterfly/mainboard.c
View File

@@ -49,7 +49,7 @@ static unsigned char get_hex_digit(char *offset)
} }
static int get_mac_address(u32 *high_dword, u32 *low_dword, 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"; char key[] = "ethernet_mac";
unsigned int offset; unsigned int offset;
@@ -118,7 +118,7 @@ static void program_mac_address(u16 io_base, u32 search_address,
} }
} }
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 key[] = "keyboard_layout";
char kbd_jpn[] = "xkb:jp::jpn"; char kbd_jpn[] = "xkb:jp::jpn";
@@ -160,7 +160,7 @@ static void program_keyboard_type(u32 search_address, u32 search_length)
static void mainboard_init(struct device *dev) static void mainboard_init(struct device *dev)
{ {
u32 search_address = 0x0; uintptr_t search_address = 0x0;
size_t search_length = -1; size_t search_length = -1;
u16 io_base = 0; u16 io_base = 0;
struct device *ethernet_dev = NULL; struct device *ethernet_dev = NULL;
@@ -180,7 +180,7 @@ static void mainboard_init(struct device *dev)
} else { } else {
vpd_file = cbfs_map("vpd.bin", &search_length); vpd_file = cbfs_map("vpd.bin", &search_length);
if (vpd_file) { if (vpd_file) {
search_address = (unsigned long)vpd_file; search_address = (uintptr_t)vpd_file;
} else { } else {
search_length = -1; search_length = -1;
search_address = 0; search_address = 0;