<p>Martin Roth <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/20988">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Arthur Heymans: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">superio/winbond/w83627*: Remove deprecated code<br><br>Early serial for W83627[HF|EHG] superios are handled by<br>superio/winbond/common/early_serial.c. Remove code<br>thus deprecated.<br><br>Build tested on select affected mainboards.<br><br>Change-Id: Idad6e0281f7a272e184feff686ce1407825429c7<br>Signed-off-by: Keith Hui <buurin@gmail.com><br>Reviewed-on: https://review.coreboot.org/20988<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/superio/winbond/w83627ehg/Makefile.inc<br>D src/superio/winbond/w83627ehg/early_serial.c<br>M src/superio/winbond/w83627ehg/w83627ehg.h<br>D src/superio/winbond/w83627hf/early_serial.c<br>M src/superio/winbond/w83627hf/w83627hf.h<br>5 files changed, 0 insertions(+), 107 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/superio/winbond/w83627ehg/Makefile.inc b/src/superio/winbond/w83627ehg/Makefile.inc<br>index b9719b5..88fb0f2 100644<br>--- a/src/superio/winbond/w83627ehg/Makefile.inc<br>+++ b/src/superio/winbond/w83627ehg/Makefile.inc<br>@@ -15,5 +15,4 @@<br> ## GNU General Public License for more details.<br> ##<br> <br>-romstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += early_serial.c<br> ramstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.c<br>diff --git a/src/superio/winbond/w83627ehg/early_serial.c b/src/superio/winbond/w83627ehg/early_serial.c<br>deleted file mode 100644<br>index b690cac..0000000<br>--- a/src/superio/winbond/w83627ehg/early_serial.c<br>+++ /dev/null<br>@@ -1,33 +0,0 @@<br>-/*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright (C) 2007 AMD<br>- * Written by Yinghai Lu <yinghai.lu@amd.com> for AMD.<br>- *<br>- * This program is free software; you can redistribute it and/or modify<br>- * it under the terms of the GNU General Public License as published by<br>- * the Free Software Foundation; either version 2 of the License, or<br>- * (at your option) any later version.<br>- *<br>- * This program is distributed in the hope that it will be useful,<br>- * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>- * GNU General Public License for more details.<br>- */<br>-<br>-#include <arch/io.h><br>-#include <device/pnp.h><br>-#include "w83627ehg.h"<br>-<br>-void pnp_enter_ext_func_mode(pnp_devfn_t dev)<br>-{<br>- u16 port = dev >> 8;<br>- outb(0x87, port);<br>- outb(0x87, port);<br>-}<br>-<br>-void pnp_exit_ext_func_mode(pnp_devfn_t dev)<br>-{<br>- u16 port = dev >> 8;<br>- outb(0xaa, port);<br>-}<br>diff --git a/src/superio/winbond/w83627ehg/w83627ehg.h b/src/superio/winbond/w83627ehg/w83627ehg.h<br>index 5b760f2..e74dbef 100644<br>--- a/src/superio/winbond/w83627ehg/w83627ehg.h<br>+++ b/src/superio/winbond/w83627ehg/w83627ehg.h<br>@@ -18,8 +18,6 @@<br> #ifndef SUPERIO_WINBOND_W83627EHG_H<br> #define SUPERIO_WINBOND_W83627EHG_H<br> <br>-#include <arch/io.h><br>-<br> #define W83627EHG_FDC 0 /* Floppy */<br> #define W83627EHG_PP 1 /* Parallel port */<br> #define W83627EHG_SP1 2 /* Com1 */<br>@@ -51,8 +49,5 @@<br> #define W83627EHG_GPIO3 ((1 << 8) | W83627EHG_GPIO_SUSLED_V)<br> #define W83627EHG_GPIO4 ((2 << 8) | W83627EHG_GPIO_SUSLED_V)<br> #define W83627EHG_GPIO5 ((3 << 8) | W83627EHG_GPIO_SUSLED_V)<br>-<br>-void pnp_enter_ext_func_mode(pnp_devfn_t dev);<br>-void pnp_exit_ext_func_mode(pnp_devfn_t dev);<br> <br> #endif /* SUPERIO_WINBOND_W83627EHG_H */<br>diff --git a/src/superio/winbond/w83627hf/early_serial.c b/src/superio/winbond/w83627hf/early_serial.c<br>deleted file mode 100644<br>index a87c7e9..0000000<br>--- a/src/superio/winbond/w83627hf/early_serial.c<br>+++ /dev/null<br>@@ -1,67 +0,0 @@<br>-/*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright (C) 2000 AG Electronics Ltd.<br>- * Copyright (C) 2003-2004 Linux Networx<br>- * Copyright (C) 2004 Tyan<br>- * Copyright (C) 2010 Win Enterprises (anishp@win-ent.com)<br>- *<br>- * This program is free software; you can redistribute it and/or modify<br>- * it under the terms of the GNU General Public License as published by<br>- * the Free Software Foundation; either version 2 of the License, or<br>- * (at your option) any later version.<br>- *<br>- * This program is distributed in the hope that it will be useful,<br>- * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>- * GNU General Public License for more details.<br>- */<br>-<br>-#include <arch/io.h><br>-#include "w83627hf.h"<br>-<br>-static void pnp_enter_ext_func_mode(pnp_devfn_t dev)<br>-{<br>- u16 port = dev >> 8;<br>- outb(0x87, port);<br>- outb(0x87, port);<br>-}<br>-<br>-static void pnp_exit_ext_func_mode(pnp_devfn_t dev)<br>-{<br>- u16 port = dev >> 8;<br>- outb(0xaa, port);<br>-}<br>-<br>-/*<br>- * FIXME: The following ROMCC boards are blocking the removal this superio's<br>- * model specific w83627hf_enable_serial() symbol.<br>- *<br>- * mainboard/supermicro/x6dai_g<br>- * mainboard/supermicro/x6dhe_g<br>- * mainboard/supermicro/x6dhr_ig<br>- * mainboard/supermicro/x6dhr_ig2<br>- *<br>- * XXX: ROMCC - everything is inlined, no forwarding function prototypes<br>- * declarations are accepted.<br>- */<br>-void w83627hf_enable_serial(pnp_devfn_t dev, u16 iobase)<br>-{<br>- pnp_enter_ext_func_mode(dev);<br>- pnp_set_logical_device(dev);<br>- pnp_set_enable(dev, 0);<br>- pnp_set_iobase(dev, PNP_IDX_IO0, iobase);<br>- pnp_set_enable(dev, 1);<br>- pnp_exit_ext_func_mode(dev);<br>-}<br>-<br>-void w83627hf_set_clksel_48(pnp_devfn_t dev)<br>-{<br>- u8 reg8;<br>-<br>- pnp_enter_ext_func_mode(dev);<br>- reg8 = pnp_read_config(dev, 0x24);<br>- reg8 |= (1 << 6); /* Set CLKSEL (clock input on pin 1) to 48MHz. */<br>- pnp_write_config(dev, 0x24, reg8);<br>- pnp_exit_ext_func_mode(dev);<br>-}<br>diff --git a/src/superio/winbond/w83627hf/w83627hf.h b/src/superio/winbond/w83627hf/w83627hf.h<br>index e4f3784..4b55e0f 100644<br>--- a/src/superio/winbond/w83627hf/w83627hf.h<br>+++ b/src/superio/winbond/w83627hf/w83627hf.h<br>@@ -112,6 +112,5 @@<br> #include <arch/io.h><br> <br> void w83627hf_set_clksel_48(pnp_devfn_t dev);<br>-void w83627hf_enable_serial(pnp_devfn_t dev, u16 iobase);<br> <br> #endif /* SUPERIO_WINBOND_W83627HF_H */<br></pre><p>To view, visit <a href="https://review.coreboot.org/20988">change 20988</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20988"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Idad6e0281f7a272e184feff686ce1407825429c7 </div>
<div style="display:none"> Gerrit-Change-Number: 20988 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Keith Hui <buurin@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz> </div>
<div style="display:none"> Gerrit-Reviewer: Keith Hui <buurin@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>