From 6fb379a1dbd60fcdd8ad30550b708ed1b9e3fa7d Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sun, 1 Jun 2014 17:38:22 +1000 Subject: mainboard: Remove #include early_serial.c from w83977tf boards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/5898 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/mainboard/a-trend/atc-6220/romstage.c | 6 ++++-- src/mainboard/abit/be6-ii_v2_0/romstage.c | 6 +++--- src/mainboard/asus/p2b-d/romstage.c | 5 +++-- src/mainboard/asus/p2b-ds/romstage.c | 5 +++-- src/mainboard/asus/p2b-f/romstage.c | 6 +++--- src/mainboard/asus/p2b-ls/romstage.c | 6 +++--- src/mainboard/asus/p2b/romstage.c | 6 ++++-- src/mainboard/asus/p3b-f/romstage.c | 6 +++--- src/mainboard/azza/pt-6ibd/romstage.c | 6 +++--- src/mainboard/msi/ms6119/romstage.c | 5 +++-- src/mainboard/msi/ms6147/romstage.c | 5 +++-- src/mainboard/msi/ms6156/romstage.c | 5 +++-- 12 files changed, 38 insertions(+), 29 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c index 63d34b213d..22d3270f78 100644 --- a/src/mainboard/a-trend/atc-6220/romstage.c +++ b/src/mainboard/a-trend/atc-6220/romstage.c @@ -30,7 +30,9 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" -#include "superio/winbond/w83977tf/early_serial.c" +#include +#include + #include #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) { - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c index 74f8404ab7..510c8ce1b5 100644 --- a/src/mainboard/abit/be6-ii_v2_0/romstage.c +++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c @@ -30,8 +30,9 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" +#include /* FIXME: It's a Winbond W83977EF, actually. */ -#include "superio/winbond/w83977tf/early_serial.c" +#include #include /* 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) { - /* FIXME: It's a Winbond W83977EF, actually. */ - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c index 213120d60a..b03dfd5828 100644 --- a/src/mainboard/asus/p2b-d/romstage.c +++ b/src/mainboard/asus/p2b-d/romstage.c @@ -30,7 +30,8 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" -#include "superio/winbond/w83977tf/early_serial.c" +#include +#include #include #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) { - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c index 20c4b3f461..b4dbe32969 100644 --- a/src/mainboard/asus/p2b-ds/romstage.c +++ b/src/mainboard/asus/p2b-ds/romstage.c @@ -30,7 +30,8 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" -#include "superio/winbond/w83977tf/early_serial.c" +#include +#include #include #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) { - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c index 93849c2271..b8577545f5 100644 --- a/src/mainboard/asus/p2b-f/romstage.c +++ b/src/mainboard/asus/p2b-f/romstage.c @@ -30,8 +30,9 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" +#include /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */ -#include "superio/winbond/w83977tf/early_serial.c" +#include #include /* 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) { - /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */ - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c index f6daa5e3f6..d046c4b2fd 100644 --- a/src/mainboard/asus/p2b-ls/romstage.c +++ b/src/mainboard/asus/p2b-ls/romstage.c @@ -30,8 +30,9 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" +#include /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */ -#include "superio/winbond/w83977tf/early_serial.c" +#include #include #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) { - /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */ - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c index 63d34b213d..22d3270f78 100644 --- a/src/mainboard/asus/p2b/romstage.c +++ b/src/mainboard/asus/p2b/romstage.c @@ -30,7 +30,9 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" -#include "superio/winbond/w83977tf/early_serial.c" +#include +#include + #include #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) { - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c index 37629486b5..e7a7f439be 100644 --- a/src/mainboard/asus/p3b-f/romstage.c +++ b/src/mainboard/asus/p3b-f/romstage.c @@ -30,8 +30,9 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" +#include /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ -#include "superio/winbond/w83977tf/early_serial.c" +#include #include /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ @@ -75,8 +76,7 @@ static void disable_spd(void) void main(unsigned long bist) { - /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c index c138d00f30..b4252a6aba 100644 --- a/src/mainboard/azza/pt-6ibd/romstage.c +++ b/src/mainboard/azza/pt-6ibd/romstage.c @@ -30,8 +30,9 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" +#include /* FIXME: It's a Winbond W83977EF, actually. */ -#include "superio/winbond/w83977tf/early_serial.c" +#include #include /* 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) { - /* FIXME: It's a Winbond W83977EF, actually. */ - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c index f597b269f2..813e8557bd 100644 --- a/src/mainboard/msi/ms6119/romstage.c +++ b/src/mainboard/msi/ms6119/romstage.c @@ -30,7 +30,8 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" -#include "superio/winbond/w83977tf/early_serial.c" +#include +#include #include #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) { - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c index 67fbdc7ee5..b7f99f5b58 100644 --- a/src/mainboard/msi/ms6147/romstage.c +++ b/src/mainboard/msi/ms6147/romstage.c @@ -30,7 +30,8 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include -#include "superio/winbond/w83977tf/early_serial.c" +#include +#include #include #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) { - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c index f1f4a67af0..09713d4f8b 100644 --- a/src/mainboard/msi/ms6156/romstage.c +++ b/src/mainboard/msi/ms6156/romstage.c @@ -30,7 +30,8 @@ #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" -#include "superio/winbond/w83977tf/early_serial.c" +#include +#include #include #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) { - w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); report_bist_failure(bist); -- cgit v1.2.3