I just went on a bugfix frenzy and fixed all printk format warnings

triggered by the AMD 690/SB600 targets.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3970 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 2025621aa8c71fffaa4b82db420d8cc50afba507..75437fc6e9e243a2a58f044c197e2958a5d3d20b 100644 (file)
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -136,7 +136,7 @@ static int lapic_start_cpu(unsigned long apicid)
        maxlvt = 4;
 
        for (j = 1; j <= num_starts; j++) {
-               printk_spew("Sending STARTUP #%d to %u.\n", j, apicid);
+               printk_spew("Sending STARTUP #%d to %lu.\n", j, apicid);
                lapic_read_around(LAPIC_SPIV);
                lapic_write(LAPIC_ESR, 0);
                lapic_read(LAPIC_ESR);
@@ -239,7 +239,7 @@ int start_cpu(device_t cpu)
                #warning "We may need to increase CONFIG_LB_MEM_TOPK, it need to be more than (0x100000+(20480 + STACK_SIZE)*CONFIG_MAX_CPU)\n"
 #endif
                if(stack_end > (CONFIG_LB_MEM_TOPK<<10)) {
-                       printk_debug("start_cpu: Please increase the CONFIG_LB_MEM_TOPK more than %dK\n", stack_end>>10);
+                       printk_debug("start_cpu: Please increase the CONFIG_LB_MEM_TOPK more than %luK\n", stack_end>>10);
                        die("Can not go on\n");
                }
                stack_end -= sizeof(struct cpu_info);

diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index aa652866500f662873aab59f4f5f9cd6d7e71fb0..a891a4385ea6204599f93e81b4b51440dd86f73a 100644 (file)
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -357,7 +357,7 @@ void set_var_mtrr_resource(void *gp, struct device *dev, struct resource *res)
 #endif
        }
        /* Allocate an msr */  
-       printk_spew(" Allocate an msr - basek = %08x, sizek = %08x,\n", basek, sizek);
+       printk_spew(" Allocate an msr - basek = %08lx, sizek = %08lx,\n", basek, sizek);
        state->range_startk = basek;
        state->range_sizek  = sizek;
 }

diff --git a/src/devices/device.c b/src/devices/device.c
index 804665968f78bdc6aeaf13f9c79e1ff8ceb4782a..a66969d9b7beb902cb59ad25721aff4c045bfc16 100644 (file)
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -358,7 +358,7 @@ void compute_allocate_resource(
                        base += size;
                        
                        printk_spew(
-                               "%s %02x *  [0x%08Lx - 0x%08Lx] %s\n",
+                               "%s %02lx *  [0x%08Lx - 0x%08Lx] %s\n",
                                dev_path(dev),
                                resource->index, 
                                resource->base, 

diff --git a/src/lib/malloc.c b/src/lib/malloc.c
index 93d5622b741f9cd4fd884e5008ec3473d7991db9..f2b8fd286ea18c9f01ce5f18b636d663f695cfc4 100644 (file)
--- a/src/lib/malloc.c
+++ b/src/lib/malloc.c
@@ -27,7 +27,7 @@ void *malloc(size_t size)
 {
        void *p;
 
-       MALLOCDBG(("%s Enter, size %d, free_mem_ptr %p\n", __func__, size, free_mem_ptr));
+       MALLOCDBG(("%s Enter, size %ld, free_mem_ptr 0x%08lx\n", __func__, size, free_mem_ptr));
        if (size < 0)
                die("Error! malloc: Size < 0");
        if (free_mem_ptr <= 0)

diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index f3092fdb8289af8d48b7e3ed605f4d605ecc3e89..9aaede4b8d15b1aee892d07ecaaf71028cfe4411 100644 (file)
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -254,7 +254,7 @@ unsigned long write_acpi_tables(unsigned long start)
        memcpy((void *)dsdt, (void *)AmlCode,
               ((acpi_header_t *) AmlCode)->length);
        current += dsdt->length;
-       printk_debug("ACPI:    * DSDT @ %08x Length %x\n", dsdt, dsdt->length);
+       printk_debug("ACPI:    * DSDT @ %p Length %x\n", dsdt, dsdt->length);
        /* FADT */
        printk_debug("ACPI:    * FADT\n");
        fadt = (acpi_fadt_t *) current;

diff --git a/src/mainboard/amd/dbm690t/irq_tables.c b/src/mainboard/amd/dbm690t/irq_tables.c
index 7ef8d732309a360d42f04111dbd2cb4f262d9ad2..38479aac14a2f6753440b24d731fd84380e33410 100644 (file)
--- a/src/mainboard/amd/dbm690t/irq_tables.c
+++ b/src/mainboard/amd/dbm690t/irq_tables.c
@@ -73,7 +73,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
        addr &= ~15;
 
        /* This table must be betweeen 0xf0000 & 0x100000 */
-       printk_info("Writing IRQ routing tables to 0x%x...", addr);
+       printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
        pirq = (void *)(addr);
        v = (u8 *) (addr);

diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index b60fb80b0ccb272c49695eb3c8933f82f81b7ded..4332099285ce382ca00fbb299e2865fd7fc62895 100644 (file)
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -61,7 +61,7 @@ static void enable_onboard_nic()
 {
        u8 byte;
 
-       printk_info("enable_onboard_nic.\n");
+       printk_info("%s.\n", __func__);
 
        /* set index register 0C50h to 13h (miscellaneous control) */
        outb(0x13, 0xC50);      /* CMIndex */
@@ -202,7 +202,7 @@ void dbm690t_enable(device_t dev)
        struct mainboard_config *mainboard =
            (struct mainboard_config *)dev->chip_info;
 
-       printk_info("Mainboard DBM690T Enable. dev=0x%x\n", dev);
+       printk_info("Mainboard DBM690T Enable. dev=0x%p\n", dev);
 
 #if (CONFIG_GFXUMA == 1)
        msr_t msr, msr2;
@@ -236,7 +236,7 @@ void dbm690t_enable(device_t dev)
        }
 
        uma_memory_base = msr.lo - uma_memory_size;     /* TOP_MEM1 */
-       printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
+       printk_info("%s: uma size 0x%08llx, memory start 0x%08llx\n",
                    __func__, uma_memory_size, uma_memory_base);
 
        /* TODO: TOP_MEM2 */
@@ -256,7 +256,7 @@ int add_mainboard_resources(struct lb_memory *mem)
         * in some circumstances we want the memory mentioned as reserved.
         */
 #if (CONFIG_GFXUMA == 1)
-       printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
+       printk_info("uma_memory_base=0x%llx, uma_memory_size=0x%llx \n",
        uma_memory_base, uma_memory_size);
        lb_add_memory_range(mem, LB_MEM_RESERVED,
                uma_memory_base, uma_memory_size);

diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c
index fb66b4bacfd5e82e915b1e79a8ef0d92361030d1..541f6e48f613f674e33d97d97d12a42a94c667a5 100644 (file)
--- a/src/mainboard/amd/pistachio/acpi_tables.c
+++ b/src/mainboard/amd/pistachio/acpi_tables.c
@@ -255,7 +255,7 @@ unsigned long write_acpi_tables(unsigned long start)
               ((acpi_header_t *) AmlCode)->length);
 
        current += dsdt->length;
-       printk_debug("ACPI:    * DSDT @ %08x Length %x\n", dsdt, dsdt->length);
+       printk_debug("ACPI:    * DSDT @ %p Length %x\n", dsdt, dsdt->length);
        /* FADT */
        printk_debug("ACPI:    * FADT\n");
        fadt = (acpi_fadt_t *) current;

diff --git a/src/mainboard/amd/pistachio/irq_tables.c b/src/mainboard/amd/pistachio/irq_tables.c
index 5a031474ce3a11cb23baf34eeb2952302c991066..c31ed2f91055dcbfe35aae54b0181dc6c7240bfa 100644 (file)
--- a/src/mainboard/amd/pistachio/irq_tables.c
+++ b/src/mainboard/amd/pistachio/irq_tables.c
@@ -73,7 +73,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
        addr &= ~15;
 
        /* This table must be betweeen 0xf0000 & 0x100000 */
-       printk_info("Writing IRQ routing tables to 0x%x...", addr);
+       printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
        pirq = (void *)(addr);
        v = (u8 *) (addr);

diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index 7651180127fba410f2da9df389a10e115b5249a7..afa953ddd855b5ca0c91d4937b48707767fc06fd 100644 (file)
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -61,7 +61,7 @@ static void enable_onboard_nic()
 {
        u8 byte;
 
-       printk_info("enable_onboard_nic.\n");
+       printk_info("%s.\n", __func__);
 
        /* enable GPM8 output */
        byte = pm_ioread(0x95);
@@ -274,7 +274,7 @@ void pistachio_enable(device_t dev)
        struct mainboard_config *mainboard =
            (struct mainboard_config *)dev->chip_info;
 
-       printk_info("Mainboard Pistachio Enable. dev=0x%x\n", dev);
+       printk_info("Mainboard Pistachio Enable. dev=0x%p\n", dev);
 
 #if (CONFIG_GFXUMA == 1)
        msr_t msr, msr2;
@@ -308,7 +308,7 @@ void pistachio_enable(device_t dev)
        }
 
        uma_memory_base = msr.lo - uma_memory_size;     /* TOP_MEM1 */
-       printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
+       printk_info("%s: uma size 0x%08llx, memory start 0x%08llx\n",
                    __func__, uma_memory_size, uma_memory_base);
 
        /* TODO: TOP_MEM2 */
@@ -328,7 +328,7 @@ int add_mainboard_resources(struct lb_memory *mem)
         * in some circumstances we want the memory mentioned as reserved.
         */
 #if (CONFIG_GFXUMA == 1)
-       printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
+       printk_info("uma_memory_base=0x%llx, uma_memory_size=0x%llx \n",
        uma_memory_base, uma_memory_size);
        lb_add_memory_range(mem, LB_MEM_RESERVED,
                uma_memory_base, uma_memory_size);

diff --git a/src/northbridge/amd/amdk8/amdk8_acpi.c b/src/northbridge/amd/amdk8/amdk8_acpi.c
index 587d540b36442306d289fb2e87629dbaced8a541..ba4b75a0ce224ea3b80ee328d90d02272e14abb4 100644 (file)
--- a/src/northbridge/amd/amdk8/amdk8_acpi.c
+++ b/src/northbridge/amd/amdk8/amdk8_acpi.c
@@ -128,7 +128,7 @@ void set_srat_mem(void *gp, struct device *dev, struct resource *res)
        basek = resk(res->base);
        sizek = resk(res->size);
 
-       printk_debug("set_srat_mem: dev %s, res->index=%04x startk=%08x, sizek=%08x\n",
+       printk_debug("set_srat_mem: dev %s, res->index=%04lx startk=%08lx, sizek=%08lx\n",
                     dev_path(dev), res->index, basek, sizek);
        /*
         * 0-640K must be on node 0

diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 0c92037b46cd10b2b5befe063f0f7855d8cdddaf..f7993760f42af6f366e86cf2a06f6659d64740ac 100644 (file)
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -473,7 +473,7 @@ static void amdk8_set_resource(device_t dev, struct resource *resource, unsigned
                limit |= (nodeid & 7);
 
                if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
-                       printk_spew("%s, enabling legacy VGA IO forwarding for %s link %s\n",
+                       printk_spew("%s, enabling legacy VGA IO forwarding for %s link 0x%x\n",
                                    __func__, dev_path(dev), link);
                        base |= PCI_IO_BASE_VGA_EN;
                }

diff --git a/src/southbridge/amd/rs690/rs690.c b/src/southbridge/amd/rs690/rs690.c
index e5d6a1e2e7ca097134a007f10c562a2198944925..40913b338876244005a8294ab50aae407843d13f 100644 (file)
--- a/src/southbridge/amd/rs690/rs690.c
+++ b/src/southbridge/amd/rs690/rs690.c
@@ -129,7 +129,7 @@ void rs690_enable(device_t dev)
        device_t nb_dev = 0, sb_dev = 0;
        int dev_ind;
 
-       printk_info("rs690_enable: dev=0x%x, VID_DID=0x%x\n", dev, get_vid_did(dev));
+       printk_info("rs690_enable: dev=%p, VID_DID=0x%x\n", dev, get_vid_did(dev));
 
        nb_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
        if (!nb_dev) {

diff --git a/src/southbridge/amd/rs690/rs690_gfx.c b/src/southbridge/amd/rs690/rs690_gfx.c
index d4c8755f8a4c5a5e4155c6ae8721e71563e1689d..0ed5a81369a6c3a2c6f2b11d0900ab1ba16b9593 100644 (file)
--- a/src/southbridge/amd/rs690/rs690_gfx.c
+++ b/src/southbridge/amd/rs690/rs690_gfx.c
@@ -121,7 +121,7 @@ static void rs690_internal_gfx_enable(device_t dev)
        device_t k8_f0 = 0, k8_f2 = 0;
        device_t nb_dev = dev_find_slot(0, 0);
 
-       printk_info("rs690_internal_gfx_enable dev=0x%x, nb_dev=0x%x.\n", dev,
+       printk_info("rs690_internal_gfx_enable dev=0x%p, nb_dev=0x%p.\n", dev,
                    nb_dev);
 
        /* set APERTURE_SIZE, 128M. */
@@ -417,7 +417,7 @@ void rs690_gfx_init(device_t nb_dev, device_t dev, u32 port)
        struct southbridge_amd_rs690_config *cfg =
            (struct southbridge_amd_rs690_config *)nb_dev->chip_info;
 
-       printk_info("rs690_gfx_init, nb_dev=0x%x, dev=0x%x, port=0x%x.\n",
+       printk_info("rs690_gfx_init, nb_dev=0x%p, dev=0x%p, port=0x%x.\n",
                    nb_dev, dev, port);
 
        /* step 0, REFCLK_SEL, skip A11 revision */

diff --git a/src/southbridge/amd/rs690/rs690_pcie.c b/src/southbridge/amd/rs690/rs690_pcie.c
index 9691e4ed1825f4a964cb59eb2c630575b86eb50d..640fa75613996112e1a64389c083858fa12e8cd6 100644 (file)
--- a/src/southbridge/amd/rs690/rs690_pcie.c
+++ b/src/southbridge/amd/rs690/rs690_pcie.c
@@ -203,7 +203,7 @@ void rs690_gpp_sb_init(device_t nb_dev, device_t dev, u32 port)
        device_t sb_dev;
        struct southbridge_amd_rs690_config *cfg =
            (struct southbridge_amd_rs690_config *)nb_dev->chip_info;
-       printk_debug("gpp_sb_init nb_dev=0x%x, dev=0x%x, port=0x%x\n", nb_dev, dev, port);
+       printk_debug("gpp_sb_init nb_dev=0x%p, dev=0x%p, port=0x%x\n", nb_dev, dev, port);
 
        /* init GPP core */
        set_pcie_enable_bits(nb_dev, 0x20 | PCIE_CORE_INDEX_GPPSB, 1 << 8,

diff --git a/src/southbridge/amd/sb600/sb600_hda.c b/src/southbridge/amd/sb600/sb600_hda.c
index 7286eb25b7a571ca4a151561864c36b5a6a85a4c..41b94a90de95493e249f2977913bfb5a11e0c11e 100644 (file)
--- a/src/southbridge/amd/sb600/sb600_hda.c
+++ b/src/southbridge/amd/sb600/sb600_hda.c
@@ -302,7 +302,7 @@ static void hda_init(struct device *dev)
                return;
 
        base = (u8 *) ((u32)res->base);
-       printk_debug("base = %08x\n", base);
+       printk_debug("base = %p\n", base);
        codec_mask = codec_detect(base);
 
        if (codec_mask) {

diff --git a/src/southbridge/amd/sb600/sb600_sata.c b/src/southbridge/amd/sb600/sb600_sata.c
index 933f59936e5e2985bf518dac4e98fcdb35834031..b285a6bc7af633d372dee1943043d0daf8511d93 100644 (file)
--- a/src/southbridge/amd/sb600/sb600_sata.c
+++ b/src/southbridge/amd/sb600/sb600_sata.c
@@ -96,7 +96,7 @@ static void sata_init(struct device *dev)
        printk_spew("sata_bar2=%x\n", sata_bar2);       /* 3040 */
        printk_spew("sata_bar3=%x\n", sata_bar3);       /* 3080 */
        printk_spew("sata_bar4=%x\n", sata_bar4);       /* 3000 */
-       printk_spew("sata_bar5=%x\n", sata_bar5);       /* e0309000 */
+       printk_spew("sata_bar5=%p\n", sata_bar5);       /* e0309000 */
 
        /* Program the 2C to 0x43801002 */
        dword = 0x43801002;

diff --git a/src/southbridge/amd/sb600/sb600_usb.c b/src/southbridge/amd/sb600/sb600_usb.c
index 51759c969b99d6bcd7363ba2c2072e9670c42604..2002114f816e082210393f23cc136ff1c3999e46 100644 (file)
--- a/src/southbridge/amd/sb600/sb600_usb.c
+++ b/src/southbridge/amd/sb600/sb600_usb.c
@@ -94,7 +94,7 @@ static void usb_init2(struct device *dev)
        /* pci_write_config32(dev, 0xf8, dword); */
 
        usb2_bar0 = (u8 *) (pci_read_config32(dev, 0x10) & ~0xFF);
-       printk_info("usb2_bar0=%x\n", usb2_bar0);
+       printk_info("usb2_bar0=%p\n", usb2_bar0);
 
        /* RPR5.4 Enables the USB PHY auto calibration resister to match 45ohm resistence */
        dword = 0x00020F00;