Now builds, and maybe the superio will even work.

This commit is contained in:
Ronald G. Minnich 2002-04-10 17:47:29 +00:00
commit eadf95ca42
4 changed files with 9 additions and 42 deletions

View file

@ -30,7 +30,7 @@ mainboardinit arch/i386/lib/console.inc
northbridge nsc/gx1
southbridge nsc/cs5530
superio SMC/fdc37b72x
nsuperio SMC/fdc37b72x com1={1} port=0x370
########################################################################
# Lots of constans, you probably don't need to change anything here.
@ -39,27 +39,6 @@ superio SMC/fdc37b72x
# processor. You probably don't want to change this.
option GX_BASE=0x40000000
########################################################################
# Super I/O configuration
# The SIO is pin strapped to show up at address 0x2e
option SIO_BASE=0x2e
# Serial Port 1
option SIO_SP1_BASE=0x3f8
option SIO_SP1_IRQ=4
# Serial Port 2 is connected to an IrDA header
#option SIO_SP2_BASE=0x2f8
#option SIO_SP2_IRQ=3
# Parallel port
option SIO_PP_BASE=0x278
option SIO_PP_IRQ=7
# GPIO Pins
option SIO_GPIO_BASE=0xe0
########################################################################
# Southbridge configuration

View file

@ -16,6 +16,5 @@ option ZKERNEL_MASK=0xffff
option ROM_SIZE=262144
option STD_FLASH=1
# Kernel command line parameters
commandline root=/dev/hda3 console=ttyS0,38400 reboot=h
payload ../eepro100.ebi

View file

@ -50,7 +50,7 @@
/* Check for Device ID */
SMC_READ($0x20)
cmp %al, $0x4c
cmp $0x4c, %al
je 2f
mov $0xfe, %al
outb %al, $0x80

View file

@ -7,16 +7,11 @@
// just define these here. We may never need them anywhere else
#define FLOPPY_DEVICE 0
#define PARALLEL_DEVICE 1
#define COM1_DEVICE 2
#define COM2_DEVICE 3
#define KBC_DEVICE 5
#ifdef W83977CTF
#define CIR_DEVICE 6
#endif
#define GAME_PORT_DEVICE 7
#define PARALLEL_DEVICE 3
#define COM1_DEVICE 4
#define COM2_DEVICE 5
#define KBC_DEVICE 7
#define GPIO_PORT2_DEVICE 8
#define GPIO_PORT3_DEVICE 9
#define ACPI_DEVICE 0xa
#define FLOPPY_DEFAULT_IOBASE 0x3f0
@ -44,8 +39,7 @@ void
enter_pnp(struct superio *sio)
{
// unlock it XXX make this a subr at some point
outb(0x87, sio->port);
outb(0x87, sio->port);
outb(0x55, sio->port);
}
void
@ -278,10 +272,6 @@ static void setup_devices(struct superio *sio)
set_logical_device(sio, GPIO_PORT2_DEVICE);
set_enable(sio, sio->gpio2);
/* gpio_port3 */
set_logical_device(sio, GPIO_PORT3_DEVICE);
set_enable(sio, sio->gpio3);
/* enable/disable acpi */
set_logical_device(sio, ACPI_DEVICE);
set_enable(sio, sio->acpi);
@ -289,11 +279,10 @@ static void setup_devices(struct superio *sio)
exit_pnp(sio);
}
struct superio_control superio_winbond_w83977ef_control = {
struct superio_control superio_SMC_fdc37b72x_control = {
pre_pci_init: (void *) 0,
init: setup_devices,
finishup: (void *) 0,
defaultport: PNPADDR,
name: "SMC fdc37b72x"
};