diff options
| -rw-r--r-- | src/mainboard/via/epia-m/Config.lb | 13 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m/Options.lb | 1 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m/auto.c | 26 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m/dsdt.asl | 9 | ||||
| -rw-r--r-- | src/mainboard/via/epia-m/dsdt.c | 22 |
5 files changed, 32 insertions, 39 deletions
diff --git a/src/mainboard/via/epia-m/Config.lb b/src/mainboard/via/epia-m/Config.lb index 6dc4b3d79a..e5e10df028 100644 --- a/src/mainboard/via/epia-m/Config.lb +++ b/src/mainboard/via/epia-m/Config.lb @@ -132,6 +132,13 @@ dir /pc80 config chip.h chip northbridge/via/vt8623 + + device apic_cluster 0 on + chip cpu/via/model_centaur + device apic 0 on end + end + end + device pci_domain 0 on chip southbridge/via/vt8235 @@ -180,10 +187,4 @@ chip northbridge/via/vt8623 device pci 0a.1 on end end end - - device apic_cluster 0 on - chip cpu/via/model_centaur - device apic 0 on end - end - end end diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb index c1abcbeded..cd8fcf1111 100644 --- a/src/mainboard/via/epia-m/Options.lb +++ b/src/mainboard/via/epia-m/Options.lb @@ -21,6 +21,7 @@ uses ROM_IMAGE_SIZE uses ROM_SECTION_SIZE uses ROM_SECTION_OFFSET uses CONFIG_ROM_STREAM_START +uses CONFIG_COMPRESSED_ROM_STREAM uses PAYLOAD_SIZE uses _ROMBASE uses _RAMBASE diff --git a/src/mainboard/via/epia-m/auto.c b/src/mainboard/via/epia-m/auto.c index c69b7bf101..e7b310ffcb 100644 --- a/src/mainboard/via/epia-m/auto.c +++ b/src/mainboard/via/epia-m/auto.c @@ -32,17 +32,11 @@ void udelay(int usecs) #include "southbridge/via/vt8235/vt8235_early_smbus.c" - #include "southbridge/via/vt8235/vt8235_early_serial.c" static void memreset_setup(void) { } -/* - static void memreset(int controllers, const struct mem_controller *ctrl) - { - } -*/ static inline int spd_read_byte(unsigned device, unsigned address) { unsigned char c; @@ -50,12 +44,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) return c; } - - #include "northbridge/via/vt8623/raminit.c" -/* - #include "sdram/generic_sdram.c" -*/ static void enable_mainboard_devices(void) { @@ -71,12 +60,11 @@ static void enable_mainboard_devices(void) pci_write_config8(dev, 0x51, 0x1f); #if 0 // This early setup switches IDE into compatibility mode before PCI gets - // // a chance to assign I/Os - // movl $CONFIG_ADDR(0, 0x89, 0x42), %eax - // // movb $0x09, %dl - // movb $0x00, %dl - // PCI_WRITE_CONFIG_BYTE - // + // a chance to assign I/Os + // movl $CONFIG_ADDR(0, 0x89, 0x42), %eax + // // movb $0x09, %dl + // movb $0x00, %dl + // PCI_WRITE_CONFIG_BYTE #endif /* we do this here as in V2, we can not yet do raw operations * to pci! @@ -132,7 +120,7 @@ static void main(unsigned long bist) /* Halt if there was a built in self test failure */ report_bist_failure(bist); - /* init_timer();*/ + // init_timer(); outb(5, 0x80); @@ -170,5 +158,7 @@ static void main(unsigned long bist) early_mtrr_init(); } + //dump_pci_devices(); + print_spew("Leaving auto.c:main()\r\n"); } diff --git a/src/mainboard/via/epia-m/dsdt.asl b/src/mainboard/via/epia-m/dsdt.asl index 2fcb77ed3a..b1b791d5f2 100644 --- a/src/mainboard/via/epia-m/dsdt.asl +++ b/src/mainboard/via/epia-m/dsdt.asl @@ -205,10 +205,11 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1) /* PCI Routing Table */ Name (_PRT, Package () { - Package () {0x000AFFFF, 0x00, LNKD, 0x00}, // Cardbus Link D - Package () {0x000AFFFF, 0x01, LNKA, 0x00}, // Cardbus Link A - Package () {0x000AFFFF, 0x02, LNKB, 0x00}, // Cardbus Link B - Package () {0x000AFFFF, 0x03, LNKC, 0x00}, // Cardbus Link C + /* Epia-MII 6000e cardbus: */ + Package () {0x000AFFFF, 0x00, LNKA, 0x00}, // Cardbus Link A + Package () {0x000AFFFF, 0x01, LNKB, 0x00}, // Cardbus Link B + Package () {0x000AFFFF, 0x02, LNKC, 0x00}, // Cardbus Link C + Package () {0x000AFFFF, 0x03, LNKD, 0x00}, // Cardbus Link D Package () {0x000DFFFF, 0x00, LNKB, 0x00}, // Firewire Link B Package () {0x000DFFFF, 0x01, LNKC, 0x00}, // Firewire Link C diff --git a/src/mainboard/via/epia-m/dsdt.c b/src/mainboard/via/epia-m/dsdt.c index 62b0f3dab0..fa878250f5 100644 --- a/src/mainboard/via/epia-m/dsdt.c +++ b/src/mainboard/via/epia-m/dsdt.c @@ -1,22 +1,22 @@ /* * * Intel ACPI Component Architecture - * ASL Optimizing Compiler / AML Disassembler version 20040715 [Aug 16 2004] - * Copyright (C) 2000 - 2004 Intel Corporation - * Supports ACPI Specification Revision 2.0c + * ASL Optimizing Compiler version 20060127 [Apr 23 2006] + * Copyright (C) 2000 - 2006 Intel Corporation + * Supports ACPI Specification Revision 3.0a * - * Compilation of "dsdt.asl" - Thu Oct 27 09:25:57 2005 + * Compilation of "dsdt.asl" - Wed Sep 6 11:36:08 2006 * * C source code output * */ -unsigned char AmlCode[] = +unsigned char AmlCode[] = { 0x44,0x53,0x44,0x54,0xF0,0x03,0x00,0x00, /* 00000000 "DSDT...." */ - 0x01,0x11,0x4C,0x58,0x42,0x49,0x4F,0x53, /* 00000008 "..LXBIOS" */ + 0x01,0x03,0x4C,0x58,0x42,0x49,0x4F,0x53, /* 00000008 "..LXBIOS" */ 0x4C,0x58,0x42,0x2D,0x44,0x53,0x44,0x54, /* 00000010 "LXB-DSDT" */ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x15,0x07,0x04,0x20,0x10,0x12,0x5F,0x50, /* 00000020 "... .._P" */ + 0x27,0x01,0x06,0x20,0x10,0x12,0x5F,0x50, /* 00000020 "'.. .._P" */ 0x52,0x5F,0x5B,0x83,0x0B,0x43,0x50,0x55, /* 00000028 "R_[..CPU" */ 0x30,0x00,0x10,0x04,0x00,0x00,0x06,0x08, /* 00000030 "0......." */ 0x5F,0x53,0x30,0x5F,0x12,0x06,0x04,0x00, /* 00000038 "_S0_...." */ @@ -81,13 +81,13 @@ unsigned char AmlCode[] = 0x00,0x08,0x5F,0x42,0x42,0x4E,0x00,0x08, /* 00000210 ".._BBN.." */ 0x5F,0x50,0x52,0x54,0x12,0x43,0x1D,0x20, /* 00000218 "_PRT.C. " */ 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x0A,0x00, /* 00000220 "........" */ - 0x00,0x4C,0x4E,0x4B,0x44,0x00,0x12,0x0D, /* 00000228 ".LNKD..." */ + 0x00,0x4C,0x4E,0x4B,0x41,0x00,0x12,0x0D, /* 00000228 ".LNKA..." */ 0x04,0x0C,0xFF,0xFF,0x0A,0x00,0x01,0x4C, /* 00000230 ".......L" */ - 0x4E,0x4B,0x41,0x00,0x12,0x0E,0x04,0x0C, /* 00000238 "NKA....." */ + 0x4E,0x4B,0x42,0x00,0x12,0x0E,0x04,0x0C, /* 00000238 "NKB....." */ 0xFF,0xFF,0x0A,0x00,0x0A,0x02,0x4C,0x4E, /* 00000240 "......LN" */ - 0x4B,0x42,0x00,0x12,0x0E,0x04,0x0C,0xFF, /* 00000248 "KB......" */ + 0x4B,0x43,0x00,0x12,0x0E,0x04,0x0C,0xFF, /* 00000248 "KC......" */ 0xFF,0x0A,0x00,0x0A,0x03,0x4C,0x4E,0x4B, /* 00000250 ".....LNK" */ - 0x43,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 00000258 "C......." */ + 0x44,0x00,0x12,0x0D,0x04,0x0C,0xFF,0xFF, /* 00000258 "D......." */ 0x0D,0x00,0x00,0x4C,0x4E,0x4B,0x42,0x00, /* 00000260 "...LNKB." */ 0x12,0x0D,0x04,0x0C,0xFF,0xFF,0x0D,0x00, /* 00000268 "........" */ 0x01,0x4C,0x4E,0x4B,0x43,0x00,0x12,0x0E, /* 00000270 ".LNKC..." */ |