diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-05-14 01:00:43 +1000 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2014-05-23 20:14:41 +0200 |
| commit | 9492b9dab49336904167c19b161e6688dfe086e4 (patch) | |
| tree | bc2366a3cb0c5418af80c120b6c7162a1c801220 /src/superio/winbond | |
| parent | 17046377191d14f46fd0af40be04899601a79768 (diff) | |
superio/winbond/w83697hf: Depreciate romstage component
Depreciate the model specific early_serial.c romstage component for this
Super I/O in favor of the recent generic winbond romstage framework.
Change-Id: I529c9cd1d8d63db3035b4828b3c3fc43911f49ce
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5727
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martin.roth@se-eng.com>
Diffstat (limited to 'src/superio/winbond')
| -rw-r--r-- | src/superio/winbond/w83697hf/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/superio/winbond/w83697hf/early_serial.c | 4 | ||||
| -rw-r--r-- | src/superio/winbond/w83697hf/w83697hf.h | 12 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/superio/winbond/w83697hf/Makefile.inc b/src/superio/winbond/w83697hf/Makefile.inc index cf032735f3..73e5b46937 100644 --- a/src/superio/winbond/w83697hf/Makefile.inc +++ b/src/superio/winbond/w83697hf/Makefile.inc @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +romstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += early_serial.c ramstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.c - diff --git a/src/superio/winbond/w83697hf/early_serial.c b/src/superio/winbond/w83697hf/early_serial.c index e435645453..6c00b2765a 100644 --- a/src/superio/winbond/w83697hf/early_serial.c +++ b/src/superio/winbond/w83697hf/early_serial.c @@ -19,6 +19,7 @@ */ #include <arch/io.h> +#include <device/pnp_def.h> #include "w83697hf.h" static void pnp_enter_ext_func_mode(device_t dev) @@ -45,7 +46,8 @@ void w83697hf_set_clksel_48(device_t dev) pnp_exit_ext_func_mode(dev); } -static void w83697hf_enable_serial(device_t dev, u16 iobase) +/* Depreciated, use winbond_enable_serial() */ +void w83697hf_enable_serial(device_t dev, u16 iobase) { pnp_enter_ext_func_mode(dev); pnp_set_logical_device(dev); diff --git a/src/superio/winbond/w83697hf/w83697hf.h b/src/superio/winbond/w83697hf/w83697hf.h index 7e353e23ce..f711786563 100644 --- a/src/superio/winbond/w83697hf/w83697hf.h +++ b/src/superio/winbond/w83697hf/w83697hf.h @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_WINBOND_W83697HF_W83697HF_H -#define SUPERIO_WINBOND_W83697HF_W83697HF_H +#ifndef SUPERIO_WINBOND_W83697HF_H +#define SUPERIO_WINBOND_W83697HF_H + +#include <arch/io.h> #define W83697HF_FDC 0 /* Floppy */ #define W83697HF_PP 1 /* Parallel port */ @@ -33,4 +35,8 @@ #define W83697HF_HWM 11 /* Hardware monitor */ void w83697hf_set_clksel_48(device_t); -#endif + +/* Depreciated, use winbond_enable_serial() */ +void w83697hf_enable_serial(device_t dev, u16 iobase); + +#endif /* SUPERIO_WINBOND_W83697HF_H */ |