diff options
author | Greg Watson <jarrah@users.sourceforge.net> | 2004-04-17 02:49:43 +0000 |
---|---|---|
committer | Greg Watson <jarrah@users.sourceforge.net> | 2004-04-17 02:49:43 +0000 |
commit | bad27b10c48d2b6ad7fbfeabc91bd1de594eed3b (patch) | |
tree | 4e6ac69e3df6ee298517f0e1850768775b04b464 /src | |
parent | 8e0586200b61cd5bf4a3f59bf7ac68efc6f9ac17 (diff) |
updated
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1513 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r-- | src/mainboard/via/epia-m/Config.lb | 14 | ||||
-rw-r--r-- | src/mainboard/via/epia-m/auto.c | 10 | ||||
-rw-r--r-- | src/mainboard/via/epia-m/mainboard.c | 2 | ||||
-rw-r--r-- | src/northbridge/via/vt8623/chip.h | 4 | ||||
-rw-r--r-- | src/northbridge/via/vt8623/northbridge.c | 10 | ||||
-rw-r--r-- | src/northbridge/via/vt8623/northbridge.h | 8 | ||||
-rw-r--r-- | src/northbridge/via/vt8623/raminit.c | 6 |
7 files changed, 22 insertions, 32 deletions
diff --git a/src/mainboard/via/epia-m/Config.lb b/src/mainboard/via/epia-m/Config.lb index 0450b2b1b9..ed43611162 100644 --- a/src/mainboard/via/epia-m/Config.lb +++ b/src/mainboard/via/epia-m/Config.lb @@ -210,18 +210,8 @@ mainboardinit ./auto.inc dir /pc80 config chip.h -northbridge via/vt8601 "vt8601" -# pci 0:0.0 -# pci 0:1.0 - southbridge via/vt8231 "vt8231" -# pci 0:11.0 -# pci 0:11.1 -# pci 0:11.2 -# pci 0:11.3 -# pci 0:11.4 -# pci 0:11.5 -# pci 0:11.6 -# pci 0:12.0 +northbridge via/vt8623 "vt8623" + southbridge via/vt8235 "vt8235" register "enable_usb" = "0" register "enable_native_ide" = "0" register "enable_com_ports" = "1" diff --git a/src/mainboard/via/epia-m/auto.c b/src/mainboard/via/epia-m/auto.c index 3e40d04e8a..20e85e4645 100644 --- a/src/mainboard/via/epia-m/auto.c +++ b/src/mainboard/via/epia-m/auto.c @@ -10,7 +10,7 @@ #include "pc80/serial.c" #include "arch/i386/lib/console.c" #include "ram/ramtest.c" -#include "northbridge/via/vt8601/raminit.h" +#include "northbridge/via/vt8623/raminit.h" #include "cpu/p6/earlymtrr.c" /* @@ -26,10 +26,10 @@ void udelay(int usecs) #include "cpu/p6/boot_cpu.c" #include "debug.c" -#include "southbridge/via/vt8231/vt8231_early_smbus.c" +#include "southbridge/via/vt8231/vt8235_early_smbus.c" -#include "southbridge/via/vt8231/vt8231_early_serial.c" +#include "southbridge/via/vt8231/vt8235_early_serial.c" static void memreset_setup(void) { } @@ -58,7 +58,7 @@ static void enable_mainboard_devices(void) device_t dev; /* dev 0 for southbridge */ - dev = pci_locate_device(PCI_ID(0x1106,0x8231), 0); + dev = pci_locate_device(PCI_ID(0x1106,0x8235), 0); if (dev == PCI_DEV_INVALID) { die("Southbridge not found!!!\n"); @@ -99,7 +99,7 @@ static void main(void) /* init_timer();*/ outb(5, 0x80); - enable_vt8231_serial(); + enable_vt8235_serial(); uart_init(); console_init(); diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c index df52081ac7..9d73a3dc25 100644 --- a/src/mainboard/via/epia-m/mainboard.c +++ b/src/mainboard/via/epia-m/mainboard.c @@ -40,6 +40,6 @@ static void enumerate(struct chip *chip) } struct chip_control mainboard_via_epia_control = { .enumerate = enumerate, - .name = "VIA EPIA mainboard ", + .name = "VIA EPIA-M mainboard ", }; diff --git a/src/northbridge/via/vt8623/chip.h b/src/northbridge/via/vt8623/chip.h index b689f0dedd..36bd3e93ff 100644 --- a/src/northbridge/via/vt8623/chip.h +++ b/src/northbridge/via/vt8623/chip.h @@ -1,5 +1,5 @@ -struct northbridge_via_vt8601_config +struct northbridge_via_vt8623_config { }; -extern struct chip_control northbridge_via_vt8601_control; +extern struct chip_control northbridge_via_vt8623_control; diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c index 5f5e5d9dd8..db5d831d74 100644 --- a/src/northbridge/via/vt8623/northbridge.c +++ b/src/northbridge/via/vt8623/northbridge.c @@ -80,7 +80,7 @@ static void enumerate(struct chip *chip) static void random_fixup() { device_t pcidev = dev_find_slot(0, 0); - printk_spew("VT8601 random fixup ...\n"); + printk_spew("VT8623 random fixup ...\n"); if (pcidev) { pci_write_config8(pcidev, 0x70, 0xc0); pci_write_config8(pcidev, 0x71, 0x88); @@ -95,8 +95,8 @@ static void random_fixup() { static void northbridge_init(struct chip *chip, enum chip_pass pass) { - struct northbridge_via_vt8601_config *conf = - (struct northbridge_via_vt8601_config *)chip->chip_info; + struct northbridge_via_vt8623_config *conf = + (struct northbridge_via_vt8623_config *)chip->chip_info; switch (pass) { case CONF_PASS_PRE_PCI: @@ -115,8 +115,8 @@ static void northbridge_init(struct chip *chip, enum chip_pass pass) } } -struct chip_control northbridge_via_vt8601_control = { +struct chip_control northbridge_via_vt8623_control = { .enumerate = enumerate, .enable = northbridge_init, - .name = "VIA vt8601 Northbridge", + .name = "VIA vt8623 Northbridge", }; diff --git a/src/northbridge/via/vt8623/northbridge.h b/src/northbridge/via/vt8623/northbridge.h index d7f8e605b8..ef63ebea78 100644 --- a/src/northbridge/via/vt8623/northbridge.h +++ b/src/northbridge/via/vt8623/northbridge.h @@ -1,6 +1,6 @@ -#ifndef NORTHBRIDGE_VIA_VT8601_H -#define NORTHBRIDGE_VIA_VT8601_H +#ifndef NORTHBRIDGE_VIA_VT8623_H +#define NORTHBRIDGE_VIA_VT8623_H -extern unsigned int vt8601_scan_root_bus(device_t root, unsigned int max); +extern unsigned int vt8623_scan_root_bus(device_t root, unsigned int max); -#endif /* NORTHBRIDGE_VIA_VT8601_H */ +#endif /* NORTHBRIDGE_VIA_VT8623_H */ diff --git a/src/northbridge/via/vt8623/raminit.c b/src/northbridge/via/vt8623/raminit.c index f295c9c737..f7c0a10fb0 100644 --- a/src/northbridge/via/vt8623/raminit.c +++ b/src/northbridge/via/vt8623/raminit.c @@ -105,8 +105,8 @@ static void sdram_set_registers(const struct mem_controller *ctrl) device_t north = (device_t) 0; uint8_t c, r; - print_err("vt8601 init starting\r\n"); - north = pci_locate_device(PCI_ID(0x1106, 0x8601), 0); + print_err("vt8623 init starting\r\n"); + north = pci_locate_device(PCI_ID(0x1106, 0x8623), 0); north = 0; print_debug_hex32(north); print_debug(" is the north\n"); @@ -389,6 +389,6 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl) print_debug(" is the MA type\r\n"); set_ma_mapping(north, slot, ma); } - print_err("vt8601 done\r\n"); + print_err("vt8623 done\r\n"); dumpnorth(north); } |