diff --git a/src/mainboard/lippert/roadrunner2/Config b/src/mainboard/lippert/roadrunner2/Config index 57943237a6..35d0d158c0 100644 --- a/src/mainboard/lippert/roadrunner2/Config +++ b/src/mainboard/lippert/roadrunner2/Config @@ -22,7 +22,7 @@ ldscript cpu/i386/reset16.lds ######################################################################## mainboardinit superio/SMC/fdc37b72x/setup_serial.inc -option SMC_BASE=0x3f0 +option SMC_BASE=0x370 mainboardinit pc80/serial.inc mainboardinit arch/i386/lib/console.inc diff --git a/src/superio/SMC/fdc37b72x/setup_serial.inc b/src/superio/SMC/fdc37b72x/setup_serial.inc index b2c82a5753..c41466dcff 100644 --- a/src/superio/SMC/fdc37b72x/setup_serial.inc +++ b/src/superio/SMC/fdc37b72x/setup_serial.inc @@ -49,8 +49,8 @@ /* Check for Device ID */ - SMC_READ($0x0d) - cmp %al, 0x28 + SMC_READ($0x20) + cmp %al, $0x4c je 2f mov $0xfe, %al outb %al, $0x80 @@ -59,33 +59,28 @@ jmp 1b #endif 2: - + // GLOBAL SETUP /* Pin configuration - need to enable IRQ 4 output */ - SMC_WRITE($0xf4, $0x03) ; + SMC_WRITE($0x39, $0x22); + SMC_WRITE($0x84, $0x24); + + // COM1 SETUO + /* set the LDN to 4 (serial port 1) */ + SMC_WRITE($4, $7) ; - /* Set address of parallel port */ -#if 0 - SMC_WRITE($0xde, $0x23) ; -#endif /* Set address of serial port 0 */ - SMC_WRITE($0xfe, $0x24) ; - - /* Set address of serial port 1 */ - - SMC_WRITE($0xbe, $0x25) ; + SMC_WRITE($0x3, $0x60) ; + SMC_WRITE($0xf8, $0x61) ; /* Set IRQs of serial ports */ - SMC_WRITE($0x21, $0x28) ; + SMC_WRITE($0x4, $0x70) ; /* Set valid bit */ - SMC_READ($0x00) - or $0x80, %al - SMC_WRITE(%al, $0x00) - + SMC_WRITE($0x1, $0x30) ; /* Exit the configuration state */ mov $0xAA, %al diff --git a/src/superio/SMC/fdc37b807/setup_serial.inc b/src/superio/SMC/fdc37b807/setup_serial.inc index b2c82a5753..8520fb448a 100644 --- a/src/superio/SMC/fdc37b807/setup_serial.inc +++ b/src/superio/SMC/fdc37b807/setup_serial.inc @@ -50,7 +50,7 @@ /* Check for Device ID */ SMC_READ($0x0d) - cmp %al, 0x28 + cmp %al, $0x28 je 2f mov $0xfe, %al outb %al, $0x80 diff --git a/src/superio/SMC/fdc37c669/setup_serial.inc b/src/superio/SMC/fdc37c669/setup_serial.inc index a0e7787b02..6588287caf 100644 --- a/src/superio/SMC/fdc37c669/setup_serial.inc +++ b/src/superio/SMC/fdc37c669/setup_serial.inc @@ -50,7 +50,7 @@ /* Check for Device ID */ SMC_READ($0x0d) - cmp %al, 0x04 + cmp %al, $0x04 je 2f mov $0xfe, %al outb %al, $0x80 diff --git a/src/superio/SMC/fdc37n769/setup_serial.inc b/src/superio/SMC/fdc37n769/setup_serial.inc index b2c82a5753..8520fb448a 100644 --- a/src/superio/SMC/fdc37n769/setup_serial.inc +++ b/src/superio/SMC/fdc37n769/setup_serial.inc @@ -50,7 +50,7 @@ /* Check for Device ID */ SMC_READ($0x0d) - cmp %al, 0x28 + cmp %al, $0x28 je 2f mov $0xfe, %al outb %al, $0x80