diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-02-09 17:52:54 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-02-09 17:52:54 +0000 |
| commit | c4ddbff70621449606fa3f0a1ad8277fac0f5aeb (patch) | |
| tree | 603222e5e54f62b47219b1477efc4bfccf8a65fa /src/southbridge/nvidia | |
| parent | 4505948faec7cc30edb9daebf53ca006d4a1645a (diff) | |
Remove some warnings, mainly from format strings which didn't match the
arguments.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3931 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/southbridge/nvidia')
| -rw-r--r-- | src/southbridge/nvidia/ck804/ck804_lpc.c | 2 | ||||
| -rw-r--r-- | src/southbridge/nvidia/ck804/ck804_sata.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/southbridge/nvidia/ck804/ck804_lpc.c b/src/southbridge/nvidia/ck804/ck804_lpc.c index 577d9f74e6..89b6f8cec2 100644 --- a/src/southbridge/nvidia/ck804/ck804_lpc.c +++ b/src/southbridge/nvidia/ck804/ck804_lpc.c @@ -314,7 +314,7 @@ static void ck804_lpc_enable_childrens_resources(device_t dev) continue; base = res->base; end = resource_end(res); - printk_debug("ck804 lpc decode:%s, base=0x%08x, end=0x%08x\r\n", dev_path(child), base, end); + printk_debug("ck804 lpc decode:%s, base=0x%08lx, end=0x%08lx\r\n", dev_path(child), base, end); switch (base) { case 0x3f8: // COM1 reg |= (1 << 0); diff --git a/src/southbridge/nvidia/ck804/ck804_sata.c b/src/southbridge/nvidia/ck804/ck804_sata.c index 9dabd662d1..7bbf900a45 100644 --- a/src/southbridge/nvidia/ck804/ck804_sata.c +++ b/src/southbridge/nvidia/ck804/ck804_sata.c @@ -11,6 +11,7 @@ #include <device/pci_ops.h> #include "ck804.h" +#if CK804_SATA_RESET_FOR_ATAPI static void sata_com_reset(struct device *dev, unsigned reset) // reset = 1 : reset // reset = 0 : clear @@ -21,7 +22,7 @@ static void sata_com_reset(struct device *dev, unsigned reset) base = (uint32_t *) pci_read_config32(dev, 0x24); - printk_debug("base = %08x\r\n", base); + printk_debug("base = %08lx\n", base); if (reset) { *(base + 4) = 0xffffffff; @@ -71,6 +72,7 @@ static void sata_com_reset(struct device *dev, unsigned reset) printk_debug("loop=%d, *(base+0x44)=%08x\r\n", loop, dword); } } +#endif static void sata_init(struct device *dev) { @@ -132,7 +134,7 @@ static void sata_init(struct device *dev) dword |= 2; pci_write_config32(dev, 0xf8, dword); -#if 0 +#if CK804_SATA_RESET_FOR_ATAPI dword = pci_read_config32(dev, 0xac); dword &= ~((1 << 13) | (1 << 14)); dword |= (1 << 13) | (0 << 14); |