The *_early_serial.c pre-RAM code should do just that -- enable the serial

port(s), and nothing else. The code in superio.c will initialize the
rest when RAM is available...

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2579 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 4 insertions, 36 deletions

diff --git a/src/superio/ite/it8661f/it8661f_early_serial.c b/src/superio/ite/it8661f/it8661f_early_serial.c
index 522ddf71cf..f117cee5e6 100644
--- a/src/superio/ite/it8661f/it8661f_early_serial.c
+++ b/src/superio/ite/it8661f/it8661f_early_serial.c
@@ -80,12 +80,9 @@ static void it8661f_enable_serial(device_t dev, unsigned iobase)
 	   PP (3), IR (4). Bits 5-7 are reserved. */
 	it8661f_sio_write(0x00, IT8661F_CONFIG_REG_LDE, 0x1f);
 
-	/* Enable all devices. */
-	it8661f_sio_write(IT8661F_FDC,  0x30, 0x1); /* Floppy */
+	/* Enable serial port(s). */
 	it8661f_sio_write(IT8661F_SP1,  0x30, 0x1); /* Serial port 1 */
 	it8661f_sio_write(IT8661F_SP2,  0x30, 0x1); /* Serial port 2 */
-	it8661f_sio_write(IT8661F_PP,   0x30, 0x1); /* Parallel port */
-	it8661f_sio_write(IT8661F_IR,   0x30, 0x1); /* IR */
 
 	/* Select 24MHz CLKIN (clear bit 1) and clear software suspend mode
 	   (clear bit 0). */
diff --git a/src/superio/ite/it8671f/it8671f_early_serial.c b/src/superio/ite/it8671f/it8671f_early_serial.c
index 68cfcd4cac..a527a051d0 100644
--- a/src/superio/ite/it8671f/it8671f_early_serial.c
+++ b/src/superio/ite/it8671f/it8671f_early_serial.c
@@ -80,13 +80,9 @@ static void it8671f_enable_serial(device_t dev, unsigned iobase)
            PP (3), Reserved (4), KBCK (5), KBCM (6), Reserved (7). */
 	it8671f_sio_write(0x00, IT8671F_CONFIG_REG_LDE, 0x6f);
 
-	/* Activate all devices. */
-	it8671f_sio_write(IT8671F_FDC,  0x30, 0x01); /* Floppy */
+	/* Enable serial port(s). */
 	it8671f_sio_write(IT8671F_SP1,  0x30, 0x01); /* Serial port 1 */
 	it8671f_sio_write(IT8671F_SP2,  0x30, 0x01); /* Serial port 2 */
-	it8671f_sio_write(IT8671F_PP,   0x30, 0x01); /* Parallel port */
-	it8671f_sio_write(IT8671F_KBCK, 0x30, 0x01); /* Keyboard */
-	it8671f_sio_write(IT8671F_KBCM, 0x30, 0x01); /* Mouse */
 
 	/* Select 24MHz CLKIN (clear bit 6) and clear software suspend
 	   mode (clear bit 0). */
diff --git a/src/superio/ite/it8673f/it8673f_early_serial.c b/src/superio/ite/it8673f/it8673f_early_serial.c
index b032c1fb8b..c9c576d8fb 100644
--- a/src/superio/ite/it8673f/it8673f_early_serial.c
+++ b/src/superio/ite/it8673f/it8673f_early_serial.c
@@ -77,13 +77,8 @@ static void it8673f_enable_serial(device_t dev, unsigned iobase)
 	/* (2) Modify the data of configuration registers. */
 
 	/* Enable all devices. */
-	it8673f_sio_write(IT8673F_FDC,  0x30, 0x1); /* Floppy */
 	it8673f_sio_write(IT8673F_SP1,  0x30, 0x1); /* Serial port 1 */
 	it8673f_sio_write(IT8673F_SP2,  0x30, 0x1); /* Serial port 2 */
-	it8673f_sio_write(IT8673F_PP,   0x30, 0x1); /* Parallel port */
-	it8673f_sio_write(IT8673F_FAN,  0x30, 0x1); /* Fan controller */
-	it8673f_sio_write(IT8673F_KBCK, 0x30, 0x1); /* Keyboard */
-	it8673f_sio_write(IT8673F_KBCM, 0x30, 0x1); /* Mouse */
 
 	/* Select 24MHz CLKIN (clear bit 0). */
 	it8673f_sio_write(0x00, IT8673F_CONFIG_REG_CLOCKSEL, 0x00);
diff --git a/src/superio/ite/it8705f/it8705f_early_serial.c b/src/superio/ite/it8705f/it8705f_early_serial.c
index ac80752e9c..2d5539c325 100644
--- a/src/superio/ite/it8705f/it8705f_early_serial.c
+++ b/src/superio/ite/it8705f/it8705f_early_serial.c
@@ -67,15 +67,9 @@ static void it8705f_enable_serial(device_t dev, unsigned iobase)
            If this register is not written, both chips are configured. */
 	/* it8705f_sio_write(0x00, IT8705F_CONFIG_REG_CONFIGSEL, 0x00); */
 
-	/* Enable all devices. */
-	it8705f_sio_write(IT8705F_FDC,  0x30, 0x1); /* Floppy */
+	/* Enable serial port(s). */
 	it8705f_sio_write(IT8705F_SP1,  0x30, 0x1); /* Serial port 1 */
 	it8705f_sio_write(IT8705F_SP2,  0x30, 0x1); /* Serial port 2 */
-	it8705f_sio_write(IT8705F_PP,   0x30, 0x1); /* Parallel port */
-	it8705f_sio_write(IT8705F_EC,   0x30, 0x1); /* Environment controller */
-	it8705f_sio_write(IT8705F_GAME, 0x30, 0x1); /* GAME port */
-	it8705f_sio_write(IT8705F_IR,   0x30, 0x1); /* Consumer IR */
-	it8705f_sio_write(IT8705F_MIDI, 0x30, 0x1); /* MIDI port */
 
 	/* Select 24MHz CLKIN (set bit 0). */
 	it8705f_sio_write(0x00, IT8705F_CONFIG_REG_CLOCKSEL, 0x01);
diff --git a/src/superio/ite/it8712f/it8712f_early_serial.c b/src/superio/ite/it8712f/it8712f_early_serial.c
index 516581a903..d9739c5f01 100644
--- a/src/superio/ite/it8712f/it8712f_early_serial.c
+++ b/src/superio/ite/it8712f/it8712f_early_serial.c
@@ -65,17 +65,9 @@ static void it8712f_enable_serial(device_t dev, unsigned iobase)
            If this register is not written, both chips are configured. */
 	/* it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CONFIGSEL, 0x00); */
 
-	/* Enable all devices. */
-	it8712f_sio_write(IT8712F_FDC,  0x30, 0x1); /* Floppy */
+	/* Enable serial port(s). */
 	it8712f_sio_write(IT8712F_SP1,  0x30, 0x1); /* Serial port 1 */
 	it8712f_sio_write(IT8712F_SP2,  0x30, 0x1); /* Serial port 2 */
-	it8712f_sio_write(IT8712F_PP,   0x30, 0x1); /* Parallel port */
-	it8712f_sio_write(IT8712F_EC,   0x30, 0x1); /* Environment controller */
-	it8712f_sio_write(IT8712F_KBCK, 0x30, 0x1); /* Keyboard */
-	it8712f_sio_write(IT8712F_KBCM, 0x30, 0x1); /* Mouse */
-	it8712f_sio_write(IT8712F_MIDI, 0x30, 0x1); /* MIDI port */
-	it8712f_sio_write(IT8712F_GAME, 0x30, 0x1); /* GAME port */
-	it8712f_sio_write(IT8712F_IR,   0x30, 0x1); /* Consumer IR */
 
 	/* Select 24MHz CLKIN (set bit 0). */
 	it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CLOCKSEL, 0x01);
diff --git a/src/superio/ite/it8718f/it8718f_early_serial.c b/src/superio/ite/it8718f/it8718f_early_serial.c
index be03b0f8f7..52b96619fc 100644
--- a/src/superio/ite/it8718f/it8718f_early_serial.c
+++ b/src/superio/ite/it8718f/it8718f_early_serial.c
@@ -66,14 +66,8 @@ static void it8718f_enable_serial(device_t dev, unsigned iobase)
 	/* it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CONFIGSEL, 0x00); */
 
 	/* Enable all devices. */
-	it8718f_sio_write(IT8718F_FDC,  0x30, 0x1); /* Floppy */
 	it8718f_sio_write(IT8718F_SP1,  0x30, 0x1); /* Serial port 1 */
 	it8718f_sio_write(IT8718F_SP2,  0x30, 0x1); /* Serial port 2 */
-	it8718f_sio_write(IT8718F_PP,   0x30, 0x1); /* Parallel port */
-	it8718f_sio_write(IT8718F_EC,   0x30, 0x1); /* Environment controller */
-	it8718f_sio_write(IT8718F_KBCK, 0x30, 0x1); /* Keyboard */
-	it8718f_sio_write(IT8718F_KBCM, 0x30, 0x1); /* Mouse */
-	it8718f_sio_write(IT8718F_IR,   0x30, 0x1); /* Consumer IR */
 
 	/* Select 24MHz CLKIN (set bit 0). */
 	it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CLOCKSEL, 0x01);