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

mainboard: Remove #include early_serial.c from w83977tf boards 

These non-ROMCC boards #include the model specific w83977tf Super I/O
romstage component. The generic winbond_early_serial() function serves
well here to further tighten integration into the new Super I/O
framework and drop dependence on #include'ing .c files, leaving only
ROMCC boards.

Change-Id: Ib63c0f29f994c54e6112702506f288535799706c
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5898
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Edward O'Callaghan 2014-06-01 17:38:22 +10:00 committed by Kyösti Mälkki
parent aef5594f74
commit 6fb379a1db
12 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/a-trend/atc-6220/romstage.c
View File

@ -30,7 +30,9 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -42,7 +44,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

6
src/mainboard/abit/be6-ii_v2_0/romstage.c
View File

@ -30,8 +30,9 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include <superio/winbond/common/winbond.h>
/* FIXME: It's a Winbond W83977EF, actually. */ /* FIXME: It's a Winbond W83977EF, actually. */
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
/* FIXME: It's a Winbond W83977EF, actually. */ /* FIXME: It's a Winbond W83977EF, actually. */
@ -44,8 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
/* FIXME: It's a Winbond W83977EF, actually. */ winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

5
src/mainboard/asus/p2b-d/romstage.c
View File

@ -30,7 +30,8 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -42,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

5
src/mainboard/asus/p2b-ds/romstage.c
View File

@ -30,7 +30,8 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -42,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

6
src/mainboard/asus/p2b-f/romstage.c
View File

@ -30,8 +30,9 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include <superio/winbond/common/winbond.h>
/* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */ /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
/* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */ /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */
@ -44,8 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
/* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */ winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

6
src/mainboard/asus/p2b-ls/romstage.c
View File

@ -30,8 +30,9 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include <superio/winbond/common/winbond.h>
/* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */ /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -43,8 +44,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
/* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */ winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

6
src/mainboard/asus/p2b/romstage.c
View File

@ -30,7 +30,9 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -42,7 +44,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

6
src/mainboard/asus/p3b-f/romstage.c
View File

@ -30,8 +30,9 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include <superio/winbond/common/winbond.h>
/* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
/* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
@ -75,8 +76,7 @@ static void disable_spd(void)
void main(unsigned long bist) void main(unsigned long bist)
{ {
/* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

6
src/mainboard/azza/pt-6ibd/romstage.c
View File

@ -30,8 +30,9 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include <superio/winbond/common/winbond.h>
/* FIXME: It's a Winbond W83977EF, actually. */ /* FIXME: It's a Winbond W83977EF, actually. */
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
/* FIXME: It's a Winbond W83977EF, actually. */ /* FIXME: It's a Winbond W83977EF, actually. */
@ -44,8 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
/* FIXME: It's a Winbond W83977EF, actually. */ winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

5
src/mainboard/msi/ms6119/romstage.c
View File

@ -30,7 +30,8 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -42,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

5
src/mainboard/msi/ms6147/romstage.c
View File

@ -30,7 +30,8 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include <cpu/x86/bist.h> #include <cpu/x86/bist.h>
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -42,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);

5
src/mainboard/msi/ms6156/romstage.c
View File

@ -30,7 +30,8 @@
#include "drivers/pc80/udelay_io.c" #include "drivers/pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "superio/winbond/w83977tf/early_serial.c" #include <superio/winbond/common/winbond.h>
#include <superio/winbond/w83977tf/w83977tf.h>
#include <lib.h> #include <lib.h>
#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) #define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
@ -42,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
void main(unsigned long bist) void main(unsigned long bist)
{ {
w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
console_init(); console_init();
report_bist_failure(bist); report_bist_failure(bist);