From c4ddbff70621449606fa3f0a1ad8277fac0f5aeb Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Mon, 9 Feb 2009 17:52:54 +0000 Subject: Remove some warnings, mainly from format strings which didn't match the arguments. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3931 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/boot/coreboot_table.c | 10 +++++----- src/arch/i386/boot/pirq_routing.c | 2 +- src/arch/i386/boot/tables.c | 2 +- src/arch/i386/lib/cpu.c | 4 ++-- src/arch/i386/lib/exception.c | 8 ++++---- src/arch/i386/smp/mpspec.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/arch/i386') diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c index e74e3e9fef..55a1697a59 100644 --- a/src/arch/i386/boot/coreboot_table.c +++ b/src/arch/i386/boot/coreboot_table.c @@ -251,7 +251,7 @@ unsigned long lb_table_fini(struct lb_header *head) head->table_checksum = compute_ip_checksum(first_rec, head->table_bytes); head->header_checksum = 0; head->header_checksum = compute_ip_checksum(head, sizeof(*head)); - printk_debug("Wrote coreboot table at: %p - %p checksum %lx\n", + printk_debug("Wrote coreboot table at: %p - %p checksum %x\n", head, rec, head->table_checksum); return (unsigned long)rec; } @@ -415,16 +415,16 @@ unsigned long write_coreboot_table( low_table_end = (unsigned long)head; } - printk_debug("Adjust low_table_end from 0x%08x to ", low_table_end); + printk_debug("Adjust low_table_end from 0x%08lx to ", low_table_end); low_table_end += 0xfff; // 4K aligned low_table_end &= ~0xfff; - printk_debug("0x%08x \n", low_table_end); + printk_debug("0x%08lx \n", low_table_end); /* The Linux kernel assumes this region is reserved */ - printk_debug("Adjust rom_table_end from 0x%08x to ", rom_table_end); + printk_debug("Adjust rom_table_end from 0x%08lx to ", rom_table_end); rom_table_end += 0xffff; // 64K align rom_table_end &= ~0xffff; - printk_debug("0x%08x \n", rom_table_end); + printk_debug("0x%08lx \n", rom_table_end); #if (HAVE_OPTION_TABLE == 1) { diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c index ca90a14532..6b4e75f0ad 100644 --- a/src/arch/i386/boot/pirq_routing.c +++ b/src/arch/i386/boot/pirq_routing.c @@ -91,7 +91,7 @@ unsigned long copy_pirq_routing_table(unsigned long addr) addr &= ~15; /* This table must be betweeen 0xf0000 & 0x100000 */ - printk_info("Copying Interrupt Routing Table to 0x%08x... ", addr); + printk_info("Copying Interrupt Routing Table to 0x%08lx... ", addr); memcpy((void *)addr, &intel_irq_routing_table, intel_irq_routing_table.size); printk_info("done.\n"); verify_copy_pirq_routing_table(addr); diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c index 5201010f01..efe6dee383 100644 --- a/src/arch/i386/boot/tables.c +++ b/src/arch/i386/boot/tables.c @@ -92,7 +92,7 @@ struct lb_memory *write_tables(void) mpc_start &= ~1023; rom_table_start = mpc_start; } - printk_debug("move mptable from 0x%0x to 0x%0x, size 0x%0x\n", low_table_end, mpc_start, mptable_size); + printk_debug("move mptable from 0x%0lx to 0x%0x, size 0x%0x\n", low_table_end, mpc_start, mptable_size); memcpy((unsigned char *)mpc_start, (unsigned char *)low_table_end, mptable_size); smp_write_floating_table_physaddr(low_table_end - SMP_FLOATING_TABLE_LEN, mpc_start); memset((unsigned char *)low_table_end, '\0', mptable_size); diff --git a/src/arch/i386/lib/cpu.c b/src/arch/i386/lib/cpu.c index 3f7361f21c..f461bbe330 100644 --- a/src/arch/i386/lib/cpu.c +++ b/src/arch/i386/lib/cpu.c @@ -225,7 +225,7 @@ void cpu_initialize(void) info = cpu_info(); - printk_notice("Initializing CPU #%d\n", info->index); + printk_notice("Initializing CPU #%ld\n", info->index); cpu = info->cpu; if (!cpu) { @@ -261,7 +261,7 @@ void cpu_initialize(void) cpu->ops->init(cpu); } - printk_info("CPU #%d initialized\n", info->index); + printk_info("CPU #%ld initialized\n", info->index); return; } diff --git a/src/arch/i386/lib/exception.c b/src/arch/i386/lib/exception.c index 2d68b918ed..a3306520b4 100644 --- a/src/arch/i386/lib/exception.c +++ b/src/arch/i386/lib/exception.c @@ -481,10 +481,10 @@ void x86_exception(struct eregs *info) } #else /* !CONFIG_GDB_STUB */ printk_emerg( - "Unexpected Exception: %d @ %02x:%08lx - Halting\n" - "Code: %d eflags: %08lx\n" - "eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n" - "edi: %08lx esi: %08lx ebp: %08lx esp: %08lx\n", + "Unexpected Exception: %d @ %02x:%08x - Halting\n" + "Code: %d eflags: %08x\n" + "eax: %08x ebx: %08x ecx: %08x edx: %08x\n" + "edi: %08x esi: %08x ebp: %08x esp: %08x\n", info->vector, info->cs, info->eip, info->error_code, info->eflags, info->eax, info->ebx, info->ecx, info->edx, diff --git a/src/arch/i386/smp/mpspec.c b/src/arch/i386/smp/mpspec.c index c22a3ec5b7..ce76fb8197 100644 --- a/src/arch/i386/smp/mpspec.c +++ b/src/arch/i386/smp/mpspec.c @@ -236,7 +236,7 @@ void smp_write_intsrc_pci_bridge(struct mp_config_table *mc, if ((child->class >> 16) != PCI_BASE_CLASS_BRIDGE) { /* pci device */ - printk_debug("route irq: %s %04x\n", dev_path(child)); + printk_debug("route irq: %s\n", dev_path(child)); for (i = 0; i < 4; i++) smp_write_intsrc(mc, irqtype, irqflag, srcbus, (slot<<2)|i, dstapic, dstirq_x[i]); goto next; @@ -246,7 +246,7 @@ void smp_write_intsrc_pci_bridge(struct mp_config_table *mc, case PCI_CLASS_BRIDGE_PCI: case PCI_CLASS_BRIDGE_PCMCIA: case PCI_CLASS_BRIDGE_CARDBUS: - printk_debug("route irq bridge: %s %04x\n", dev_path(child)); + printk_debug("route irq bridge: %s\n", dev_path(child)); smp_write_intsrc_pci_bridge(mc, irqtype, irqflag, child, dstapic, dstirq_x); } -- cgit v1.2.3