From c51dc44bf2b76ac47b83ee76bee3357ce4b173de Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 7 Apr 2010 01:44:04 +0000 Subject: "no warnings day" last round for today. still warnings - help appreciated. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5363 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/msi/ms9185/mptable.c | 7 +++---- src/mainboard/msi/ms9185/romstage.c | 4 +++- src/mainboard/via/epia-m/fadt.c | 8 ++++---- src/mainboard/via/epia-m/mainboard.c | 5 ----- src/mainboard/via/epia-n/acpi_tables.c | 3 ++- src/mainboard/via/epia-n/fadt.c | 8 ++++---- 6 files changed, 16 insertions(+), 19 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/msi/ms9185/mptable.c b/src/mainboard/msi/ms9185/mptable.c index d40db7bda3..5ec6f30459 100644 --- a/src/mainboard/msi/ms9185/mptable.c +++ b/src/mainboard/msi/ms9185/mptable.c @@ -43,8 +43,8 @@ extern void get_bus_conf(void); static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; - static const char oem[3] = "MSI"; - static const char productid[6] = "MS9185 "; + static const char oem[8] = "MSI "; + static const char productid[12] = "MS9185 "; struct mp_config_table *mc; unsigned char bus_num; @@ -82,8 +82,7 @@ static void *smp_write_config_table(void *v) /*I/O APICs: APIC ID Version State Address*/ { - device_t dev = 0; - int i; + device_t dev = 0; struct resource *res; for(i=0; i<3; i++) { dev = dev_find_device(0x1166, 0x0235, dev); diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c index 04c8dbd540..e7fb87227f 100644 --- a/src/mainboard/msi/ms9185/romstage.c +++ b/src/mainboard/msi/ms9185/romstage.c @@ -57,6 +57,7 @@ #include "northbridge/amd/amdk8/raminit.h" #include "cpu/amd/model_fxx/apic_timer.c" #include "lib/delay.c" +#include #include "cpu/x86/lapic/boot_cpu.c" #include "northbridge/amd/amdk8/reset_test.c" @@ -151,7 +152,8 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) }; - struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); + struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); int needs_reset; unsigned bsp_apicid = 0; diff --git a/src/mainboard/via/epia-m/fadt.c b/src/mainboard/via/epia-m/fadt.c index 632dbf6df8..d1af915d7b 100644 --- a/src/mainboard/via/epia-m/fadt.c +++ b/src/mainboard/via/epia-m/fadt.c @@ -37,8 +37,8 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){ memcpy(header->asl_compiler_id,ASLC,4); header->asl_compiler_revision=0; - fadt->firmware_ctrl=facs; - fadt->dsdt= dsdt; + fadt->firmware_ctrl=(u32)facs; + fadt->dsdt=(u32)dsdt; fadt->preferred_pm_profile=0; fadt->sci_int=5; fadt->smi_cmd = 0; @@ -84,9 +84,9 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){ fadt->reset_reg.addrh = 0x0; fadt->reset_value = 0; - fadt->x_firmware_ctl_l = facs; + fadt->x_firmware_ctl_l = (u32)facs; fadt->x_firmware_ctl_h = 0; - fadt->x_dsdt_l = dsdt; + fadt->x_dsdt_l = (u32)dsdt; fadt->x_dsdt_h = 0; fadt->x_pm1a_evt_blk.space_id = 1; diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c index 0fe49fc46f..43e11d30ba 100644 --- a/src/mainboard/via/epia-m/mainboard.c +++ b/src/mainboard/via/epia-m/mainboard.c @@ -7,9 +7,6 @@ #include "chip.h" #include "vgachip.h" -void vga_enable_console(); - - static void vga_fixup(void) { // we do this right here because: // - all the hardware is working, and some VGA bioses seem to need @@ -22,8 +19,6 @@ static void vga_fixup(void) { do_vgabios(); post_code(0x93); vga_enable_console(); - - } void write_protect_vgabios(void) diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c index 904ddefb07..0f194de34f 100644 --- a/src/mainboard/via/epia-n/acpi_tables.c +++ b/src/mainboard/via/epia-n/acpi_tables.c @@ -126,7 +126,6 @@ unsigned long write_acpi_tables(unsigned long start) unsigned long current; acpi_rsdp_t *rsdp; acpi_rsdt_t *rsdt; - acpi_xsdt_t *xsdt; acpi_madt_t *madt; acpi_fadt_t *fadt; acpi_facs_t *facs; @@ -163,8 +162,10 @@ unsigned long write_acpi_tables(unsigned long start) dsdt = (acpi_header_t *)current; current += AmlCode.length; memcpy((void *)dsdt, &AmlCode, AmlCode.length); +#if 0 dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = acpi_checksum(dsdt,dsdt->length); +#endif printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length); printk(BIOS_DEBUG, "ACPI: * FADT\n"); diff --git a/src/mainboard/via/epia-n/fadt.c b/src/mainboard/via/epia-n/fadt.c index f894eee55d..d7896f5cb8 100644 --- a/src/mainboard/via/epia-n/fadt.c +++ b/src/mainboard/via/epia-n/fadt.c @@ -39,8 +39,8 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){ memcpy(header->asl_compiler_id,ASLC,4); header->asl_compiler_revision=0; - fadt->firmware_ctrl=facs; - fadt->dsdt= dsdt; + fadt->firmware_ctrl=(u32)facs; + fadt->dsdt= (u32)dsdt; fadt->preferred_pm_profile=0; fadt->sci_int=VT8237R_ACPI_IRQ; fadt->smi_cmd = 0; @@ -86,9 +86,9 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){ fadt->reset_reg.addrh = 0x0; fadt->reset_value = 0; - fadt->x_firmware_ctl_l = facs; + fadt->x_firmware_ctl_l = (u32)facs; fadt->x_firmware_ctl_h = 0; - fadt->x_dsdt_l = dsdt; + fadt->x_dsdt_l = (u32)dsdt; fadt->x_dsdt_h = 0; fadt->x_pm1a_evt_blk.space_id = 1; -- cgit v1.2.3