GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Edward O'Callaghan 2014-05-14 01:00:43 +10:00 committed by Patrick Georgi
parent 1704637719
commit 9492b9dab4
6 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/asus/k8v-x/romstage.c
View File

@ -38,7 +38,8 @@ unsigned int get_sbdn(unsigned bus);
#include "cpu/x86/lapic.h" #include "cpu/x86/lapic.h"
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/early_ht.c" #include "northbridge/amd/amdk8/early_ht.c"
#include "superio/winbond/w83697hf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83697hf/w83697hf.h>
#include "southbridge/via/vt8237r/early_smbus.c" #include "southbridge/via/vt8237r/early_smbus.c"
#include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
@ -108,7 +109,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
int needs_reset = 0; int needs_reset = 0;
struct sys_info *sysinfo = &sysinfo_car; struct sys_info *sysinfo = &sysinfo_car;
w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
enable_rom_decode(); enable_rom_decode();

6
src/mainboard/bcom/winnetp680/romstage.c
View File

@ -33,7 +33,9 @@
#include <lib.h> #include <lib.h>
#include <spd.h> #include <spd.h>
#include "southbridge/via/vt8237r/early_smbus.c" #include "southbridge/via/vt8237r/early_smbus.c"
#include "superio/winbond/w83697hf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83697hf/w83697hf.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83697HF_SP1) #define SERIAL_DEV PNP_DEV(0x2e, W83697HF_SP1)
static inline int spd_read_byte(unsigned device, unsigned address) static inline int spd_read_byte(unsigned device, unsigned address)
@ -85,7 +87,7 @@ void main(unsigned long bist)
pci_write_config8(ctrl.d0f0, 0x4f, 0x01); pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
w83697hf_set_clksel_48(SERIAL_DEV); w83697hf_set_clksel_48(SERIAL_DEV);
w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
enable_smbus(); enable_smbus();

5
src/mainboard/via/epia-m700/romstage.c
View File

@ -42,7 +42,8 @@
#include "northbridge/via/vx800/raminit.h" #include "northbridge/via/vx800/raminit.h"
#include "northbridge/via/vx800/raminit.c" #include "northbridge/via/vx800/raminit.c"
#include "wakeup.h" #include "wakeup.h"
#include "superio/winbond/w83697hf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83697hf/w83697hf.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83697HF_SP1) #define SERIAL_DEV PNP_DEV(0x2e, W83697HF_SP1)
#define DUMMY_DEV PNP_DEV(0x2e, 0) #define DUMMY_DEV PNP_DEV(0x2e, 0)
@ -385,7 +386,7 @@ void main(unsigned long bist)
pci_write_config8(PCI_DEV(0, 0, 0), 0x4f, 0x01); pci_write_config8(PCI_DEV(0, 0, 0), 0x4f, 0x01);
/* EmbedComInit(); */ /* EmbedComInit(); */
w83697hf_set_clksel_48(DUMMY_DEV); w83697hf_set_clksel_48(DUMMY_DEV);
w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
/* enable_vx800_serial(); */ /* enable_vx800_serial(); */
/* /*

2
src/superio/winbond/w83697hf/Makefile.inc
View File

@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## 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 ramstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.c

4
src/superio/winbond/w83697hf/early_serial.c
View File

@ -19,6 +19,7 @@
*/ */
#include <arch/io.h> #include <arch/io.h>
#include <device/pnp_def.h>
#include "w83697hf.h" #include "w83697hf.h"
static void pnp_enter_ext_func_mode(device_t dev) 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); 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_enter_ext_func_mode(dev);
pnp_set_logical_device(dev); pnp_set_logical_device(dev);

12
src/superio/winbond/w83697hf/w83697hf.h
View File

@ -18,8 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef SUPERIO_WINBOND_W83697HF_W83697HF_H #ifndef SUPERIO_WINBOND_W83697HF_H
#define SUPERIO_WINBOND_W83697HF_W83697HF_H #define SUPERIO_WINBOND_W83697HF_H
#include <arch/io.h>
#define W83697HF_FDC 0 /* Floppy */ #define W83697HF_FDC 0 /* Floppy */
#define W83697HF_PP 1 /* Parallel port */ #define W83697HF_PP 1 /* Parallel port */
@ -33,4 +35,8 @@
#define W83697HF_HWM 11 /* Hardware monitor */ #define W83697HF_HWM 11 /* Hardware monitor */
void w83697hf_set_clksel_48(device_t); 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 */