diff options
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/via/epia-m700/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/acpi_tables.c | 19 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/cache_as_ram_auto.c | 15 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/driving_clk_phase_data.c | 2 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m700/wakeup.c | 4 |
5 files changed, 19 insertions, 23 deletions
diff --git a/src/mainboard/via/epia-m700/Config.lb b/src/mainboard/via/epia-m700/Config.lb index 77ccb6e703..636f69ef8e 100644 --- a/src/mainboard/via/epia-m700/Config.lb +++ b/src/mainboard/via/epia-m700/Config.lb @@ -58,7 +58,7 @@ if CONFIG_USE_DCACHE_RAM end end mainboardinit cpu/x86/16bit/entry16.inc -ldscript /cpu/via/16bit/entry16.lds +ldscript /cpu/x86/16bit/entry16.lds mainboardinit northbridge/via/vx800/romstrap.inc ldscript /northbridge/via/vx800/romstrap.lds diff --git a/src/mainboard/via/epia-m700/acpi_tables.c b/src/mainboard/via/epia-m700/acpi_tables.c index 709af4b65e..ecb8de48e3 100644 --- a/src/mainboard/via/epia-m700/acpi_tables.c +++ b/src/mainboard/via/epia-m700/acpi_tables.c @@ -59,25 +59,6 @@ unsigned long acpi_fill_mcfg(unsigned long current) return current; } -unsigned long acpi_create_madt_lapics(unsigned long current) -{ - device_t cpu; - int cpu_index = 0; - - for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) { - continue; - } - if (!cpu->enabled) - continue; - current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, - cpu_index, cpu->path.apic.apic_id); - cpu_index++; - } - return current; -} - unsigned long acpi_create_madt_lapic_nmis(unsigned long current, u16 flags, u8 lint) { diff --git a/src/mainboard/via/epia-m700/cache_as_ram_auto.c b/src/mainboard/via/epia-m700/cache_as_ram_auto.c index de5acb90bd..8a2c8a0267 100644 --- a/src/mainboard/via/epia-m700/cache_as_ram_auto.c +++ b/src/mainboard/via/epia-m700/cache_as_ram_auto.c @@ -208,6 +208,21 @@ static void enable_shadow_ram(void) #endif } +/* !!FIXME!! + * This is a bogus definition to get it to compile. + */ + +struct VIA_PCI_REG_INIT_TABLE { + u8 and_val; + u8 or_val; + u8 bus; + u8 dev; + u8 func; + u8 reg; + u8 v1; + u8 v2; +}; + /* * Added this table 2008-11-28. * This table contains the value needed to be set before begin to init DRAM. diff --git a/src/mainboard/via/epia-m700/driving_clk_phase_data.c b/src/mainboard/via/epia-m700/driving_clk_phase_data.c index 6309a0717d..0beec20613 100644 --- a/src/mainboard/via/epia-m700/driving_clk_phase_data.c +++ b/src/mainboard/via/epia-m700/driving_clk_phase_data.c @@ -204,7 +204,7 @@ static const u8 DDR2_ChA_DQS_Input_Capture_Tbl[DQS_INPUT_CAPTURE_REG_NUM ][DQS_I #endif /* vt6413D */ -static const u8DDR2_ChA_DQS_Input_Capture_Tbl[DQS_INPUT_CAPTURE_REG_NUM][DQS_INPUT_CAPTURE_FREQ_NUM] = { +static const u8 DDR2_ChA_DQS_Input_Capture_Tbl[DQS_INPUT_CAPTURE_REG_NUM][DQS_INPUT_CAPTURE_FREQ_NUM] = { // (And NOT) DDR800 DDR667 DDR533 DDR400 //Reg Mask Value Value Value Value {0x78, 0xC0, 0x0D, 0x07, 0x03, 0x01}, // 1Rank diff --git a/src/mainboard/via/epia-m700/wakeup.c b/src/mainboard/via/epia-m700/wakeup.c index b22de15259..011b680b40 100644 --- a/src/mainboard/via/epia-m700/wakeup.c +++ b/src/mainboard/via/epia-m700/wakeup.c @@ -131,9 +131,9 @@ void acpi_jump_wake(u32 vector) memcpy((void *)(WAKE_THUNK16_ADDR - 100), jump_to_wakeup, sizeof(jump_to_wakeup)); - jason_tsc_count(); + //jason_tsc_count(); printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); - jason_tsc_count_end(); + //jason_tsc_count_end(); unsigned long long *real_mode_gdt_entries_at_eseg; real_mode_gdt_entries_at_eseg = WAKE_THUNK16_GDT; /* Copy from real_mode_gdt_entries and change limition to 1M and data base to 0; */ |