diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/boot/gdt.c | 4 | ||||
| -rw-r--r-- | src/arch/i386/boot/tables.c | 4 | ||||
| -rw-r--r-- | src/arch/i386/lib/pci_ops_auto.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/i386/boot/gdt.c b/src/arch/i386/boot/gdt.c index c4ed37486d..0230acf208 100644 --- a/src/arch/i386/boot/gdt.c +++ b/src/arch/i386/boot/gdt.c @@ -47,11 +47,11 @@ void move_gdt(void) printk(BIOS_ERR, "Error: Could not relocate GDT.\n"); return; } - printk_debug("Moving GDT to %#lx...", newgdt); + printk_debug("Moving GDT to %p...", newgdt); memcpy((void*)newgdt, &gdt, num_gdt_bytes); } - gdtarg.base = newgdt; + gdtarg.base = (u32)newgdt; gdtarg.limit = num_gdt_bytes - 1; __asm__ __volatile__ ("lgdt %0\n\t" : : "m" (gdtarg)); diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c index b47826dd06..03ebda60f7 100644 --- a/src/arch/i386/boot/tables.c +++ b/src/arch/i386/boot/tables.c @@ -191,7 +191,7 @@ struct lb_memory *write_tables(void) #define MAX_COREBOOT_TABLE_SIZE (8 * 1024) post_code(0x9d); - high_table_pointer = cbmem_add(CBMEM_ID_CBTABLE, MAX_COREBOOT_TABLE_SIZE); + high_table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE, MAX_COREBOOT_TABLE_SIZE); if (high_table_pointer) { unsigned long new_high_table_pointer; @@ -202,7 +202,7 @@ struct lb_memory *write_tables(void) if (new_high_table_pointer > (high_table_pointer + MAX_COREBOOT_TABLE_SIZE)) - printk_err("%s: coreboot table didn't fit (%llx)\n", + printk_err("%s: coreboot table didn't fit (%lx)\n", __func__, new_high_table_pointer - high_table_pointer); diff --git a/src/arch/i386/lib/pci_ops_auto.c b/src/arch/i386/lib/pci_ops_auto.c index f453d47826..1dd2494ba9 100644 --- a/src/arch/i386/lib/pci_ops_auto.c +++ b/src/arch/i386/lib/pci_ops_auto.c @@ -43,7 +43,7 @@ static int pci_sanity_check(const struct pci_bus_operations *o) struct pci_bus_operations *pci_bus_fallback_ops = NULL; -const struct pci_bus_operations *pci_check_direct(void) +static const struct pci_bus_operations *pci_check_direct(void) { unsigned int tmp; @@ -86,7 +86,7 @@ const struct pci_bus_operations *pci_check_direct(void) const struct pci_bus_operations *pci_remember_direct(void) { if (!pci_bus_fallback_ops) - pci_bus_fallback_ops = pci_check_direct(); + pci_bus_fallback_ops = (struct pci_bus_operations *)pci_check_direct(); return pci_bus_fallback_ops; } |