[coreboot] [commit] r5251 - in trunk/src: cpu/amd/model_fxx include/cpu/amd mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 mainboard/amd/pistachio mainboard/amd/serengeti_cheetah ma...
repository service
svn at coreboot.org
Wed Mar 17 05:40:15 CET 2010
Author: stepan
Date: Wed Mar 17 05:40:15 2010
New Revision: 5251
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5251
Log:
trivial warning fixes, mostly for ACPI code
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified:
trunk/src/cpu/amd/model_fxx/model_fxx_init.c
trunk/src/include/cpu/amd/microcode.h
trunk/src/mainboard/amd/dbm690t/acpi_tables.c
trunk/src/mainboard/amd/mahogany/acpi_tables.c
trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c
trunk/src/mainboard/amd/pistachio/acpi_tables.c
trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c
trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c
trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c
trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c
trunk/src/mainboard/iwill/dk8_htx/irq_tables.c
trunk/src/mainboard/iwill/dk8_htx/mptable.c
trunk/src/mainboard/kontron/kt690/acpi_tables.c
trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c
trunk/src/mainboard/technexion/tim5690/acpi_tables.c
trunk/src/mainboard/technexion/tim8690/acpi_tables.c
trunk/src/mainboard/via/epia-m/acpi_tables.c
trunk/src/mainboard/via/epia-m700/acpi_tables.c
trunk/src/mainboard/via/epia-n/acpi_tables.c
trunk/src/mainboard/via/vt8454c/acpi_tables.c
trunk/src/southbridge/amd/amd8111/amd8111_acpi.c
trunk/src/southbridge/amd/amd8111/amd8111_nic.c
trunk/src/superio/winbond/w83627hf/superio.c
Modified: trunk/src/cpu/amd/model_fxx/model_fxx_init.c
==============================================================================
--- trunk/src/cpu/amd/model_fxx/model_fxx_init.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/cpu/amd/model_fxx/model_fxx_init.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -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 @@
}
-extern void model_fxx_update_microcode(unsigned cpu_deviceid);
-
#if CONFIG_USBDEBUG_DIRECT
static unsigned ehci_debug_addr;
#endif
Modified: trunk/src/include/cpu/amd/microcode.h
==============================================================================
--- trunk/src/include/cpu/amd/microcode.h Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/include/cpu/amd/microcode.h Wed Mar 17 05:40:15 2010 (r5251)
@@ -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 */
Modified: trunk/src/mainboard/amd/dbm690t/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -101,7 +101,7 @@
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;
Modified: trunk/src/mainboard/amd/mahogany/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -101,7 +101,7 @@
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;
Modified: trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -93,7 +93,7 @@
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 @@
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;
Modified: trunk/src/mainboard/amd/pistachio/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -101,7 +101,7 @@
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;
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -156,7 +156,7 @@
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 @@
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 @@
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");
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -165,7 +165,7 @@
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 @@
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;
Modified: trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/asus/a8v-e_se/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -123,7 +123,7 @@
((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");
Modified: trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/asus/m2v-mx_se/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -138,7 +138,7 @@
((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");
Modified: trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/gigabyte/m57sli/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -148,7 +148,7 @@
((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");
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -99,7 +99,7 @@
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 @@
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 @@
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 @@
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");
Modified: trunk/src/mainboard/iwill/dk8_htx/irq_tables.c
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/irq_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/iwill/dk8_htx/irq_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -58,7 +58,7 @@
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);
Modified: trunk/src/mainboard/iwill/dk8_htx/mptable.c
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/mptable.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/iwill/dk8_htx/mptable.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -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 ";
Modified: trunk/src/mainboard/kontron/kt690/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -101,7 +101,7 @@
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;
Modified: trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -152,7 +152,7 @@
((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");
Modified: trunk/src/mainboard/technexion/tim5690/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -101,7 +101,7 @@
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;
Modified: trunk/src/mainboard/technexion/tim8690/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -101,7 +101,7 @@
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;
Modified: trunk/src/mainboard/via/epia-m/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/via/epia-m/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/via/epia-m/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -79,7 +79,7 @@
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;
Modified: trunk/src/mainboard/via/epia-m700/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/via/epia-m700/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/via/epia-m700/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -163,7 +163,7 @@
((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;
Modified: trunk/src/mainboard/via/epia-n/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/via/epia-n/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/via/epia-n/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -165,7 +165,7 @@
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;
Modified: trunk/src/mainboard/via/vt8454c/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/via/vt8454c/acpi_tables.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/mainboard/via/vt8454c/acpi_tables.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -187,7 +187,7 @@
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");
Modified: trunk/src/southbridge/amd/amd8111/amd8111_acpi.c
==============================================================================
--- trunk/src/southbridge/amd/amd8111/amd8111_acpi.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/southbridge/amd/amd8111/amd8111_acpi.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -73,12 +73,12 @@
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 @@
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
Modified: trunk/src/southbridge/amd/amd8111/amd8111_nic.c
==============================================================================
--- trunk/src/southbridge/amd/amd8111/amd8111_nic.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/southbridge/amd/amd8111/amd8111_nic.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -54,12 +54,12 @@
/* 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");
}
Modified: trunk/src/superio/winbond/w83627hf/superio.c
==============================================================================
--- trunk/src/superio/winbond/w83627hf/superio.c Wed Mar 17 05:38:22 2010 (r5250)
+++ trunk/src/superio/winbond/w83627hf/superio.c Wed Mar 17 05:40:15 2010 (r5251)
@@ -57,6 +57,7 @@
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 @@
outb(inb(port + 1) | 0x80, port + 1);
pnp_exit_ext_func_mode(dev);
}
+#endif
static void enable_hwm_smbus(device_t dev)
{
More information about the coreboot
mailing list