From 81998090792ebc1a6e39455f5fcb4d2c9ec9c095 Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Date: Mon, 28 Apr 2014 18:07:33 +1000
Subject: mainboard/: Avoid including early_serial.c from w83627hf

Following the reasoning of:
dbbc136 mainboard/asrock/e350m1: Avoid including early_serial.c

Change-Id: I5d729b90cf6713de2674fb00c726cd2944a3ab4e
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5597
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
---
 src/mainboard/supermicro/x7db8/romstage.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mainboard/supermicro')

diff --git a/src/mainboard/supermicro/x7db8/romstage.c b/src/mainboard/supermicro/x7db8/romstage.c
index bc54ed7306..791028e7dc 100644
--- a/src/mainboard/supermicro/x7db8/romstage.c
+++ b/src/mainboard/supermicro/x7db8/romstage.c
@@ -29,7 +29,8 @@
 #include <lib.h>
 #include <console/console.h>
 #include <cpu/x86/bist.h>
-#include <superio/winbond/w83627hf/early_serial.c>
+#include <superio/winbond/common/winbond.h>
+#include <superio/winbond/w83627hf/w83627hf.h>
 #include <northbridge/intel/i5000/raminit.h>
 #include "northbridge/intel/i3100/i3100.h"
 #include "southbridge/intel/i3100/i3100.h"
@@ -43,6 +44,8 @@
 #define RCBA_GCS   0x3410 /* 32 bit */
 #define RCBA_FD    0x3418 /* 32 bit */
 
+#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
+
 static void early_config(void)
 {
 	u32 gcs, rpc, fd;
@@ -115,8 +118,7 @@ void main(unsigned long bist)
 
 	i5000_lpc_config();
 
-	w83627hf_enable_serial(PNP_DEV(0x2e, 2), 0x3f8);
-
+	winbond_enable_serial(SERIAL_DEV, 0x3f8);
 	console_init();
 
 	/* Halt if there was a built in self test failure */
-- 
cgit v1.2.3