diff options
| author | Ronald G. Minnich <rminnich@gmail.com> | 2009-09-25 19:53:59 +0000 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2009-09-25 19:53:59 +0000 |
| commit | 45847beb4947442f6e7e78e04de50bfbc5798a7e (patch) | |
| tree | ee1921fc4ab767a54dcf98f5e0ac2fae044b8afa /src/mainboard/dell/s1850/auto.c | |
| parent | 03bdc3e07003308da3a85e773811556a1e540200 (diff) | |
Trivial fixups to get this board further along.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4675 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/dell/s1850/auto.c')
| -rw-r--r-- | src/mainboard/dell/s1850/auto.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/mainboard/dell/s1850/auto.c b/src/mainboard/dell/s1850/auto.c index f884f4ba3c..ad3619e76d 100644 --- a/src/mainboard/dell/s1850/auto.c +++ b/src/mainboard/dell/s1850/auto.c @@ -13,14 +13,13 @@ #include "lib/ramtest.c" #include "southbridge/intel/i82801er/i82801er_early_smbus.c" #include "northbridge/intel/e7520/raminit.h" -#include "superio/winbond/w83627hf/w83627hf.h" +#include "superio/nsc/pc8374/pc8374_early_serial.c" #include "cpu/x86/lapic/boot_cpu.c" #include "cpu/x86/mtrr/earlymtrr.c" #include "debug.c" #include "watchdog.c" #include "reset.c" -#include "s2850_fixups.c" -#include "superio/winbond/w83627hf/w83627hf_early_init.c" +#include "s1850_fixups.c" #include "northbridge/intel/e7520/memory_initialized.c" #include "cpu/x86/bist.h" @@ -28,8 +27,7 @@ #define SIO_GPIO_BASE 0x680 #define SIO_XBUS_BASE 0x4880 -#define CONSOLE_SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) -#define HIDDEN_SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP2) +#define CONSOLE_SERIAL_DEV PNP_DEV(0x2e, PC8374_SP1) #define DEVPRES_CONFIG ( \ DEVPRES_D0F0 | \ @@ -201,11 +199,9 @@ static void main(unsigned long bist) } } /* Setup the console */ + mainboard_set_ich5(); bmc_foad(); - outb(0x87,0x2e); - outb(0x87,0x2e); - pnp_write_config(CONSOLE_SERIAL_DEV, 0x24, 0x84 | (1 << 6)); - w83627hf_enable_dev(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); + pc8374_enable_serial(CONSOLE_SERIAL_DEV, CONFIG_TTYS0_BASE); uart_init(); console_init(); |