trivial warning fixes, mostly for ACPI code

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5251 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

25 files changed, 34 insertions, 37 deletions

diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c
index b4a981bcb3..b190921d77 100644
--- a/src/cpu/amd/model_fxx/model_fxx_init.c
+++ b/src/cpu/amd/model_fxx/model_fxx_init.c
@@ -21,6 +21,7 @@
 #include "../../../northbridge/amd/amdk8/amdk8.h"
 
 #include <cpu/amd/model_fxx_rev.h>
+#include <cpu/amd/microcode.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
@@ -462,8 +463,6 @@ static inline void k8_errata(void)
 
 }
 
-extern void model_fxx_update_microcode(unsigned cpu_deviceid);
-
 #if CONFIG_USBDEBUG_DIRECT
 static unsigned ehci_debug_addr;
 #endif
diff --git a/src/include/cpu/amd/microcode.h b/src/include/cpu/amd/microcode.h
index 0ebdeb95ff..ece4528cf7 100644
--- a/src/include/cpu/amd/microcode.h
+++ b/src/include/cpu/amd/microcode.h
@@ -2,5 +2,6 @@
 #define CPU_AMD_MICORCODE_H
 
 void amd_update_microcode(void *microcode_updates, unsigned processor_rev_id);
+void model_fxx_update_microcode(unsigned cpu_deviceid);
 #endif /* CPU_AMD_MICROCODE_H */
 
diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index 00a7c02769..f450b7c4bf 100644
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	uint8_t *PCI;
 	uint8_t *HCIN;
diff --git a/src/mainboard/amd/mahogany/acpi_tables.c b/src/mainboard/amd/mahogany/acpi_tables.c
index f8108e8177..fdc56c8f80 100644
--- a/src/mainboard/amd/mahogany/acpi_tables.c
+++ b/src/mainboard/amd/mahogany/acpi_tables.c
@@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	uint8_t *PCI;
 	uint8_t *HCIN;
diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index aaa155822b..8e4c7a47dd 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -93,7 +93,7 @@ extern void get_bus_conf(void);
 extern void update_ssdt(void *ssdt);
 
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	u8 *PCI;
 	u8 *HCIN;
@@ -251,7 +251,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	current += ((acpi_header_t *)AmlCode)->length;
 	memcpy((void *)dsdt,(void *)AmlCode, \
 			((acpi_header_t *)AmlCode)->length);
-	printk_debug("ACPI:    * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
+	printk_debug("ACPI:    * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 
 	/* FACS */ // it needs 64 bit alignment
 	current	  = ( current + 0x07) & -0x08;
diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c
index 2e02462511..9b2377c68a 100644
--- a/src/mainboard/amd/pistachio/acpi_tables.c
+++ b/src/mainboard/amd/pistachio/acpi_tables.c
@@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	uint8_t *PCI;
 	uint8_t *HCIN;
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index 9c59160cb6..a55ab640f3 100644
--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -156,7 +156,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
         uint8_t *PCI;
         uint8_t *HCIN;
@@ -200,8 +200,6 @@ unsigned long write_acpi_tables(unsigned long start)
 	acpi_header_t *ssdtx;
 	unsigned char *p;
 
-	unsigned char *AmlCode_ssdtx[HC_POSSIBLE_NUM];
-
 	int i;
 
 	get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
@@ -313,7 +311,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	current += ((acpi_header_t *)AmlCode)->length;
 	memcpy((void *)dsdt,(void *)AmlCode, \
 			((acpi_header_t *)AmlCode)->length);
-	printk_debug("ACPI:    * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
+	printk_debug("ACPI:    * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 
 	/* FDAT */
 	printk_debug("ACPI:    * FADT\n");
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
index f6741b9ec9..853e50535f 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
@@ -165,7 +165,7 @@ extern void get_bus_conf(void);
 extern void update_ssdt(void *ssdt);
 
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	u8 *PCI;
 	u8 *HCIN;
@@ -323,7 +323,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	current += ((acpi_header_t *)AmlCode)->length;
 	memcpy((void *)dsdt,(void *)AmlCode, \
 			((acpi_header_t *)AmlCode)->length);
-	printk_debug("ACPI:    * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
+	printk_debug("ACPI:    * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 
 	/* FACS */ // it needs 64 bit alignment
 	current	  = ( current + 0x07) & -0x08;
diff --git a/src/mainboard/asus/a8v-e_se/acpi_tables.c b/src/mainboard/asus/a8v-e_se/acpi_tables.c
index 8783482a1f..80b024dc53 100644
--- a/src/mainboard/asus/a8v-e_se/acpi_tables.c
+++ b/src/mainboard/asus/a8v-e_se/acpi_tables.c
@@ -123,7 +123,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	       ((acpi_header_t *) AmlCode)->length);
 	dsdt->checksum = 0;	/* Don't trust iasl to get this right. */
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n", dsdt,
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt,
 		     dsdt->length);
 	printk_debug("ACPI:     * FADT\n");
 
diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
index 43dbc029e0..81f6255197 100644
--- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c
+++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
@@ -138,7 +138,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	       ((acpi_header_t *) AmlCode)->length);
 	dsdt->checksum = 0;	/* Don't trust iasl to get this right. */
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n", dsdt,
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt,
 		     dsdt->length);
 	printk_debug("ACPI:     * FADT\n");
 
diff --git a/src/mainboard/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c
index bc27b9991a..1e3d28c00a 100644
--- a/src/mainboard/gigabyte/m57sli/acpi_tables.c
+++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c
@@ -148,7 +148,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	       ((acpi_header_t *) AmlCode)->length);
 	dsdt->checksum = 0;	/* Don't trust iasl to get this right. */
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n", dsdt,
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt,
 		     dsdt->length);
 	printk_debug("ACPI:     * FADT\n");
 
diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c
index 619f11657f..82195f6e01 100644
--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c
+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c
@@ -99,7 +99,7 @@ unsigned long acpi_fill_madt(unsigned long current)
                 int j = 0;
 
                 for(i=1; i< sysconf.hc_possible_num; i++) {
-			unsigned d;
+			unsigned d = 0;
                         if(!(sysconf.pci1234[i] & 0x1) ) continue;
                         // 8131 need to use +4
 			
@@ -159,7 +159,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
         uint8_t *PCI;
         uint8_t *HCIN;
@@ -203,8 +203,6 @@ unsigned long write_acpi_tables(unsigned long start)
 	acpi_header_t *ssdtx;
 	unsigned char *p;
 
-	unsigned char *AmlCode_ssdtx[HC_POSSIBLE_NUM];
-
 	int i;
 
 	get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
@@ -318,7 +316,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	current += ((acpi_header_t *)AmlCode)->length;
 	memcpy((void *)dsdt,(void *)AmlCode, \
 			((acpi_header_t *)AmlCode)->length);
-	printk_debug("ACPI:    * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
+	printk_debug("ACPI:    * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 
 	/* FDAT */
 	printk_debug("ACPI:    * FADT\n");
diff --git a/src/mainboard/iwill/dk8_htx/irq_tables.c b/src/mainboard/iwill/dk8_htx/irq_tables.c
index d6837c061b..97676f3c70 100644
--- a/src/mainboard/iwill/dk8_htx/irq_tables.c
+++ b/src/mainboard/iwill/dk8_htx/irq_tables.c
@@ -58,7 +58,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 = (uint8_t *)(addr);
diff --git a/src/mainboard/iwill/dk8_htx/mptable.c b/src/mainboard/iwill/dk8_htx/mptable.c
index c191580efe..25c02b0361 100644
--- a/src/mainboard/iwill/dk8_htx/mptable.c
+++ b/src/mainboard/iwill/dk8_htx/mptable.c
@@ -12,7 +12,7 @@
 
 extern void get_bus_conf(void);
 
-void *smp_write_config_table(void *v)
+static void *smp_write_config_table(void *v)
 {
         static const char sig[4] = "PCMP";
         static const char oem[8] = "IWILL   ";
diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c
index 00a7c02769..f450b7c4bf 100644
--- a/src/mainboard/kontron/kt690/acpi_tables.c
+++ b/src/mainboard/kontron/kt690/acpi_tables.c
@@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	uint8_t *PCI;
 	uint8_t *HCIN;
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index aead6fc105..d2e3997fe6 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -152,7 +152,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	       ((acpi_header_t *) AmlCode)->length);
 	dsdt->checksum = 0;	/* Don't trust iasl to get this right. */
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n", dsdt,
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt,
 		     dsdt->length);
 	printk_debug("ACPI:     * FADT\n");
 
diff --git a/src/mainboard/technexion/tim5690/acpi_tables.c b/src/mainboard/technexion/tim5690/acpi_tables.c
index 00a7c02769..f450b7c4bf 100644
--- a/src/mainboard/technexion/tim5690/acpi_tables.c
+++ b/src/mainboard/technexion/tim5690/acpi_tables.c
@@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	uint8_t *PCI;
 	uint8_t *HCIN;
diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c
index 00a7c02769..f450b7c4bf 100644
--- a/src/mainboard/technexion/tim8690/acpi_tables.c
+++ b/src/mainboard/technexion/tim8690/acpi_tables.c
@@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
 	uint8_t *PCI;
 	uint8_t *HCIN;
diff --git a/src/mainboard/via/epia-m/acpi_tables.c b/src/mainboard/via/epia-m/acpi_tables.c
index 3f58d66824..3df2b1a121 100644
--- a/src/mainboard/via/epia-m/acpi_tables.c
+++ b/src/mainboard/via/epia-m/acpi_tables.c
@@ -79,7 +79,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length);
 	dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
 	dsdt->checksum = acpi_checksum(dsdt,dsdt->length);
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 	printk_debug("ACPI:     * FADT\n");
 
 	fadt = (acpi_fadt_t *) current;
diff --git a/src/mainboard/via/epia-m700/acpi_tables.c b/src/mainboard/via/epia-m700/acpi_tables.c
index 4664ec111a..51c47149eb 100644
--- a/src/mainboard/via/epia-m700/acpi_tables.c
+++ b/src/mainboard/via/epia-m700/acpi_tables.c
@@ -163,7 +163,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	       ((acpi_header_t *) AmlCode_dsdt)->length);
 	dsdt->checksum = 0; /* Don't trust iasl to get this right. */
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n", dsdt, dsdt->length);
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt, dsdt->length);
 
 	printk_debug("ACPI:     * FADT\n");
 	fadt = (acpi_fadt_t *) current;
diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c
index b5d19c8c20..b7cdaeb636 100644
--- a/src/mainboard/via/epia-n/acpi_tables.c
+++ b/src/mainboard/via/epia-n/acpi_tables.c
@@ -165,7 +165,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length);
 	dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
 	dsdt->checksum = acpi_checksum(dsdt,dsdt->length);
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 	printk_debug("ACPI:     * FADT\n");
 
 	fadt = (acpi_fadt_t *) current;
diff --git a/src/mainboard/via/vt8454c/acpi_tables.c b/src/mainboard/via/vt8454c/acpi_tables.c
index 793aceb017..24f7dd42a8 100644
--- a/src/mainboard/via/vt8454c/acpi_tables.c
+++ b/src/mainboard/via/vt8454c/acpi_tables.c
@@ -187,7 +187,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	dsdt->checksum = 0;	// don't trust intel iasl compiler to get this right
 	dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
 #endif
-	printk_debug("ACPI:     * DSDT @ %08x Length %x\n", dsdt,
+	printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt,
 		     dsdt->length);
 	printk_debug("ACPI:     * FADT\n");
 
diff --git a/src/southbridge/amd/amd8111/amd8111_acpi.c b/src/southbridge/amd/amd8111/amd8111_acpi.c
index f318b37621..67a789c08a 100644
--- a/src/southbridge/amd/amd8111/amd8111_acpi.c
+++ b/src/southbridge/amd/amd8111/amd8111_acpi.c
@@ -73,12 +73,12 @@ unsigned pm_base;
 static void acpi_init(struct device *dev)
 {
 	uint8_t byte;
-	uint16_t word;
 	uint16_t pm10_bar;
 	uint32_t dword;
 	int on;
 
 #if 0
+	uint16_t word;
 	printk_debug("ACPI: disabling NMI watchdog.. ");
 	byte = pci_read_config8(dev, 0x49);
 	pci_write_config8(dev, 0x49, byte | (1<<2));
@@ -98,9 +98,8 @@ static void acpi_init(struct device *dev)
 	word = pci_read_config16(dev, 0x46);
 	pci_write_config16(dev, 0x46, word | (1<<9));
 	printk_debug("done.\n");
-
-	
 #endif
+
 	/* To enable the register 0xcf9 in the IO space
 	 * bit [D5] is set in the amd8111 configuration register.
 	 * The config. reg. is devBx41.  Register 0xcf9 allows
diff --git a/src/southbridge/amd/amd8111/amd8111_nic.c b/src/southbridge/amd/amd8111/amd8111_nic.c
index 98ac62b5d7..aa06253a46 100644
--- a/src/southbridge/amd/amd8111/amd8111_nic.c
+++ b/src/southbridge/amd/amd8111/amd8111_nic.c
@@ -54,12 +54,12 @@ static void nic_init(struct device *dev)
 	/* Hard Reset PHY */
 	printk_debug("Reseting PHY... ");
 	if (conf->phy_lowreset) {
-		write32((void *)(mmio + CMD3), VAL0 | PHY_RST_POL | RESET_PHY);
+		write32((mmio + CMD3), VAL0 | PHY_RST_POL | RESET_PHY);
 	} else {
-		write32((void *)(mmio + CMD3), VAL0 | RESET_PHY);
+		write32((mmio + CMD3), VAL0 | RESET_PHY);
 	}
 	mdelay(15);
-	write32((void *)(mmio + CMD3), RESET_PHY);
+	write32((mmio + CMD3), RESET_PHY);
 	printk_debug("Done\n");
 }
 
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 1d9b31c928..20f7a207cf 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -57,6 +57,7 @@ static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg)
 	return inb(port_base + 1);
 }
 
+#if CONFIG_EXPERT
 static void w83627hf_16_bit_addr_qual(device_t dev)
 {
       int port = dev->path.pnp.port >> 8;
@@ -66,6 +67,7 @@ static void w83627hf_16_bit_addr_qual(device_t dev)
       outb(inb(port + 1) | 0x80, port + 1);
       pnp_exit_ext_func_mode(dev);
 }
+#endif
 
 static void enable_hwm_smbus(device_t dev)
 {