print the known cbfs types in cbfstool "usage"

[coreboot.git] / src / northbridge / via / cn400 / vgabios.c

diff --git a/src/northbridge/via/cn400/vgabios.c b/src/northbridge/via/cn400/vgabios.c
index 0b1cff7541a0a1754285f013470a33905bd12bfe..5519b309cdac637f6138c859cdce95b318da524b 100644 (file)
--- a/src/northbridge/via/cn400/vgabios.c
+++ b/src/northbridge/via/cn400/vgabios.c
@@ -336,7 +336,7 @@ void do_vgabios(void)
 {
        device_t dev;
        unsigned long busdevfn;
-       unsigned int rom = 0;
+       u32 rom;
        unsigned char *buf;
        unsigned int size = 64*1024;
        int i;
@@ -357,7 +357,7 @@ void do_vgabios(void)
        /* declare rom address here - keep any config data out of the way
         * of core LXB stuff */
 
-        rom = cbfs_load_optionrom(dev->vendor, dev->device, 0);
+        rom = (u32)cbfs_load_optionrom(dev->vendor, dev->device, 0);
        pci_write_config32(dev, PCI_ROM_ADDRESS, rom|1);
        printk(BIOS_DEBUG, "VGA BIOS ROM base address: %x\n", rom);
 
@@ -371,7 +371,7 @@ void do_vgabios(void)
                buf = (unsigned char *) 0xc0000;
                if (buf[0]==0x55 && buf[1]==0xAA) {
                        busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn;
-                       printk(BIOS_DEBUG, "bus/devfn = %#x\n", busdevfn);
+                       printk(BIOS_DEBUG, "bus/devfn = %#lx\n", busdevfn);
 
                        real_mode_switch_call_vga(busdevfn);
                } else
@@ -567,14 +567,14 @@ int biosint(unsigned long intnumber,
                      eax, ebx, ecx, edx);
        printk(BIOS_DEBUG, "biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n",
                     ebp, esp, edi, esi);
-       printk(BIOS_DEBUG, "biosint:  ip 0x%x   cs 0x%x  flags 0x%x\n",
+       printk(BIOS_DEBUG, "biosint:  ip 0x%lx   cs 0x%lx  flags 0x%lx\n",
                     ip, cs, flags);
 
        // cases in a good compiler are just as good as your own tables. 
        switch (intnumber) {
        case 0 ... 15:
                // These are not BIOS service, but the CPU-generated exceptions
-               printk(BIOS_INFO, "biosint: Oops, exception %u\n", intnumber);
+               printk(BIOS_INFO, "biosint: Oops, exception %lu\n", intnumber);
                if (esp < 0x1000) {
                        printk(BIOS_DEBUG, "Stack contents: ");
                        while (esp < 0x1000) {
@@ -602,8 +602,7 @@ int biosint(unsigned long intnumber,
                                &ebx, &edx, &ecx, &eax, &flags);
                break;
        default:
-               printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%x\n", 
-                           intnumber);
+               printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%lx\n", intnumber);
                break;
        }
        if (ret)