[coreboot-gerrit] New patch to review for coreboot: e283afc superio/winbond/w83627dhg: Convert romstage to generic component

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Sun Apr 27 14:53:20 CEST 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5588

-gerrit

commit e283afcdbc53308ecebb1f2c89c40c77afe00ea9
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Sun Apr 27 22:51:40 2014 +1000

    superio/winbond/w83627dhg: Convert romstage to generic component
    
    Convert the serial init to the generic romstage component and
    corresponding boards using this sio.
    
    Change-Id: I36bcf38c4351130be1ed924ecfe606336d0433f3
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/mainboard/asrock/939a785gmh/romstage.c   |  5 +++--
 src/mainboard/kontron/kt690/romstage.c       |  5 +++--
 src/mainboard/lippert/toucan-af/romstage.c   |  5 +++--
 src/mainboard/supermicro/h8qgi/romstage.c    |  3 ++-
 src/mainboard/supermicro/h8scm/romstage.c    |  3 ++-
 src/mainboard/tyan/s8226/romstage.c          |  5 +++--
 src/superio/winbond/w83627dhg/early_serial.c | 10 ----------
 src/superio/winbond/w83627dhg/w83627dhg.h    |  7 +++----
 8 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/mainboard/asrock/939a785gmh/romstage.c b/src/mainboard/asrock/939a785gmh/romstage.c
index edc5830..538d79c 100644
--- a/src/mainboard/asrock/939a785gmh/romstage.c
+++ b/src/mainboard/asrock/939a785gmh/romstage.c
@@ -37,7 +37,8 @@
 #include <spd.h>
 #include "cpu/x86/lapic.h"
 #include "northbridge/amd/amdk8/reset_test.c"
-#include "superio/winbond/w83627dhg/w83627dhg.h"
+#include <superio/winbond/common/winbound.h>
+#include <superio/winbond/w83627dhg/w83627dhg.h>
 #include "cpu/x86/bist.h"
 #include "northbridge/amd/amdk8/setup_resource_map.c"
 #include "southbridge/amd/rs780/early_setup.c"
@@ -153,7 +154,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	sb7xx_51xx_lpc_init();
 
 	sio_init();
-	w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
+	winbound_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 
 	console_init();
 
diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c
index 52e54d4..52b5e95 100644
--- a/src/mainboard/kontron/kt690/romstage.c
+++ b/src/mainboard/kontron/kt690/romstage.c
@@ -38,7 +38,8 @@
 #include "cpu/x86/lapic.h"
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
-#include "superio/winbond/w83627dhg/w83627dhg.h"
+#include <superio/winbond/common/winbound.h>
+#include <superio/winbond/w83627dhg/w83627dhg.h>
 #include <cpu/amd/mtrr.h>
 #include "cpu/x86/bist.h"
 #include "northbridge/amd/amdk8/setup_resource_map.c"
@@ -89,7 +90,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	enable_rs690_dev8();
 	sb600_lpc_init();
 
-	w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
+	winbound_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 
 	console_init();
 
diff --git a/src/mainboard/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/romstage.c
index 4f62268..7680587 100644
--- a/src/mainboard/lippert/toucan-af/romstage.c
+++ b/src/mainboard/lippert/toucan-af/romstage.c
@@ -31,7 +31,8 @@
 #include <cpu/x86/mtrr.h>
 #include "agesawrapper.h"
 #include "cpu/x86/bist.h"
-#include "superio/winbond/w83627dhg/w83627dhg.h"
+#include <superio/winbond/common/winbound.h>
+#include <superio/winbond/w83627dhg/w83627dhg.h>
 #include "cpu/x86/lapic.h"
 #include "drivers/pc80/i8254.c"
 #include "drivers/pc80/i8259.c"
@@ -70,7 +71,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 		sb_Poweron_Init();
 
 		post_code(0x31);
-		w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
+		winbound_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 		console_init();
 	}
 
diff --git a/src/mainboard/supermicro/h8qgi/romstage.c b/src/mainboard/supermicro/h8qgi/romstage.c
index ea4ed8e..bdedefc 100644
--- a/src/mainboard/supermicro/h8qgi/romstage.c
+++ b/src/mainboard/supermicro/h8qgi/romstage.c
@@ -31,7 +31,8 @@
 #include <nb_cimx.h>
 #include <sb_cimx.h>
 #include "superio/nuvoton/wpcm450/wpcm450.h"
-#include "superio/winbond/w83627dhg/w83627dhg.h"
+#include <superio/winbond/common/winbound.h>
+#include <superio/winbond/w83627dhg/w83627dhg.h>
 
 extern void disable_cache_as_ram(void); /* cache_as_ram.inc */
 
diff --git a/src/mainboard/supermicro/h8scm/romstage.c b/src/mainboard/supermicro/h8scm/romstage.c
index 9ee1dfa..2ed3758 100644
--- a/src/mainboard/supermicro/h8scm/romstage.c
+++ b/src/mainboard/supermicro/h8scm/romstage.c
@@ -33,7 +33,8 @@
 #include "src/drivers/pc80/i8254.c"
 #include "src/drivers/pc80/i8259.c"
 #include "superio/nuvoton/wpcm450/wpcm450.h"
-#include "superio/winbond/w83627dhg/w83627dhg.h"
+#include <superio/winbond/common/winbound.h>
+#include <superio/winbond/w83627dhg/w83627dhg.h>
 
 extern void disable_cache_as_ram(void); /* cache_as_ram.inc */
 
diff --git a/src/mainboard/tyan/s8226/romstage.c b/src/mainboard/tyan/s8226/romstage.c
index a6c33e8..bd2865c 100644
--- a/src/mainboard/tyan/s8226/romstage.c
+++ b/src/mainboard/tyan/s8226/romstage.c
@@ -31,7 +31,8 @@
 #include <nb_cimx.h>
 #include <sb_cimx.h>
 #include "superio/nuvoton/wpcm450/wpcm450.h"
-#include "superio/winbond/w83627dhg/w83627dhg.h"
+#include <superio/winbond/common/winbound.h>
+#include <superio/winbond/w83627dhg/w83627dhg.h>
 #include "src/drivers/pc80/i8254.c"
 #include "src/drivers/pc80/i8259.c"
 
@@ -54,7 +55,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
 	sb7xx_51xx_enable_wideio(0, 0x1600); /* though UARTs are on the NUVOTON BMC */
 	w83627dhg_set_clksel_48(DUMMY_DEV);
-	w83627dhg_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
+	winbound_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 	sb7xx_51xx_disable_wideio(0);
 	post_code(0x34);
 
diff --git a/src/superio/winbond/w83627dhg/early_serial.c b/src/superio/winbond/w83627dhg/early_serial.c
index ec9e81e..67aaa93 100644
--- a/src/superio/winbond/w83627dhg/early_serial.c
+++ b/src/superio/winbond/w83627dhg/early_serial.c
@@ -37,16 +37,6 @@ void pnp_exit_ext_func_mode(device_t dev)
 	outb(0xaa, port);
 }
 
-void w83627dhg_enable_serial(device_t dev, u16 iobase)
-{
-	pnp_enter_ext_func_mode(dev);
-	pnp_set_logical_device(dev);
-	pnp_set_enable(dev, 0);
-	pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
-	pnp_set_enable(dev, 1);
-	pnp_exit_ext_func_mode(dev);
-}
-
 /**
  * Select Pin 89, Pin 90 function as I2C interface SDA, SCL.
  *  {Pin 89, Pin 90} function can be selected as {GP33, GP32}, or
diff --git a/src/superio/winbond/w83627dhg/w83627dhg.h b/src/superio/winbond/w83627dhg/w83627dhg.h
index 9e83d34..08ea04f 100644
--- a/src/superio/winbond/w83627dhg/w83627dhg.h
+++ b/src/superio/winbond/w83627dhg/w83627dhg.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SUPERIO_WINBOND_W83627DHG_W83627DHG_H
-#define SUPERIO_WINBOND_W83627DHG_W83627DHG_H
+#ifndef SUPERIO_WINBOND_W83627DHG_H
+#define SUPERIO_WINBOND_W83627DHG_H
 
 #define W83627DHG_FDC              0   /* Floppy */
 #define W83627DHG_PP               1   /* Parallel port */
@@ -54,8 +54,7 @@
 
 void pnp_enter_ext_func_mode(device_t dev);
 void pnp_exit_ext_func_mode(device_t dev);
-void w83627dhg_enable_serial(device_t dev, u16 iobase);
 void w83627dhg_enable_i2c(device_t dev);
 void w83627dhg_set_clksel_48(device_t dev);
 
-#endif
+#endif /* SUPERIO_WINBOND_W83627DHG_H */



More information about the coreboot-gerrit mailing list