diff options
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/amd/cs5535/cs5535_early_setup.c | 10 | ||||
| -rw-r--r-- | src/southbridge/amd/cs5536/cs5536_smbus2.h | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ex/i82801ex_early_smbus.c | 2 | ||||
| -rw-r--r-- | src/southbridge/nvidia/mcp55/mcp55_early_setup_car.c | 2 | ||||
| -rw-r--r-- | src/southbridge/nvidia/mcp55/mcp55_fadt.c | 8 | ||||
| -rw-r--r-- | src/southbridge/via/vt8235/vt8235.c | 2 |
6 files changed, 13 insertions, 15 deletions
diff --git a/src/southbridge/amd/cs5535/cs5535_early_setup.c b/src/southbridge/amd/cs5535/cs5535_early_setup.c index 583602c3dd..fbb3647578 100644 --- a/src/southbridge/amd/cs5535/cs5535_early_setup.c +++ b/src/southbridge/amd/cs5535/cs5535_early_setup.c @@ -23,11 +23,11 @@ static void cs5535_setup_extmsr(void) /* forward MSR access to CS5535_GLINK_PORT_NUM to CS5535_DEV_NUM */ msr.hi = msr.lo = 0x00000000; - if (CS5535_GLINK_PORT_NUM <= 4) { - msr.lo = CS5535_DEV_NUM << ((CS5535_GLINK_PORT_NUM - 1) * 8); - } else { - msr.hi = CS5535_DEV_NUM << ((CS5535_GLINK_PORT_NUM - 5) * 8); - } +#if CS5535_GLINK_PORT_NUM <= 4 + msr.lo = CS5535_DEV_NUM << ((CS5535_GLINK_PORT_NUM - 1) * 8); +#else + msr.hi = CS5535_DEV_NUM << ((CS5535_GLINK_PORT_NUM - 5) * 8); +#endif wrmsr(0x5000201e, msr); } diff --git a/src/southbridge/amd/cs5536/cs5536_smbus2.h b/src/southbridge/amd/cs5536/cs5536_smbus2.h index a470b3714c..6e50a8cc84 100644 --- a/src/southbridge/amd/cs5536/cs5536_smbus2.h +++ b/src/southbridge/amd/cs5536/cs5536_smbus2.h @@ -239,9 +239,9 @@ static void _doread(unsigned smbus_io_base, unsigned char device, *data++ = val; if (count > 1) { - int ret = smbus_wait(smbus_io_base); + ret = smbus_wait(smbus_io_base); if (ret) - return ret; + return; } count--; diff --git a/src/southbridge/intel/i82801ex/i82801ex_early_smbus.c b/src/southbridge/intel/i82801ex/i82801ex_early_smbus.c index 0ad5c74ee0..3b24d62c25 100644 --- a/src/southbridge/intel/i82801ex/i82801ex_early_smbus.c +++ b/src/southbridge/intel/i82801ex/i82801ex_early_smbus.c @@ -66,8 +66,6 @@ static void smbus_write_byte(unsigned device, unsigned address, unsigned char va static int smbus_write_block(unsigned device, unsigned length, unsigned cmd, unsigned data1, unsigned data2) { - unsigned char global_control_register; - unsigned char global_status_register; unsigned char byte; unsigned char stat; int i; diff --git a/src/southbridge/nvidia/mcp55/mcp55_early_setup_car.c b/src/southbridge/nvidia/mcp55/mcp55_early_setup_car.c index 6d776d38bd..06d9f273c4 100644 --- a/src/southbridge/nvidia/mcp55/mcp55_early_setup_car.c +++ b/src/southbridge/nvidia/mcp55/mcp55_early_setup_car.c @@ -388,7 +388,7 @@ static int mcp55_early_setup_x(void) int mcp55_num = 0; unsigned busnx; unsigned devnx; - int ht_c_index,j; + int ht_c_index; /* FIXME: multi pci segment handling */ diff --git a/src/southbridge/nvidia/mcp55/mcp55_fadt.c b/src/southbridge/nvidia/mcp55/mcp55_fadt.c index 7c7ad6954c..8d80409719 100644 --- a/src/southbridge/nvidia/mcp55/mcp55_fadt.c +++ b/src/southbridge/nvidia/mcp55/mcp55_fadt.c @@ -51,8 +51,8 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) printk(BIOS_INFO, "ACPI: pm_base: %u...\n", pm_base); - fadt->firmware_ctrl = facs; - fadt->dsdt = dsdt; + fadt->firmware_ctrl = (u32)facs; + fadt->dsdt = (u32)dsdt; fadt->preferred_pm_profile = 1; //check fadt->sci_int = 9; /* disable system management mode by setting to 0 */ @@ -108,9 +108,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/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c index 2687972afa..92bd9d8391 100644 --- a/src/southbridge/via/vt8235/vt8235.c +++ b/src/southbridge/via/vt8235/vt8235.c @@ -41,7 +41,7 @@ void dump_south(device_t dev0) } } -void set_led() +void set_led(void) { // set power led to steady now that lxbios has virtually done its job device_t dev; |