Patch set updated for coreboot: 7ce3e2f superio/winbond/w83977f: Avoid .c includes

[Edward O'Callaghan]

Edward O'Callaghan ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5447

-gerrit

commit 7ce3e2f84e5d59b509c0924e5ed484497f27c167
Author: Edward O'Callaghan 
Date:   Thu Apr 3 03:29:22 2014 +1100

superio/winbond/w83977f: Avoid .c includes

Following the same reasoning as commit
    d304331 superio/fintek/f81865f: Avoid .c includes
    Clean up the early_serial #include directives in mainboard/romstage
    code.

Change-Id: I97f14306b2c269b99d60327a6f9869de6a7d7cc3
    Signed-off-by: Edward O'Callaghan 
---
 src/mainboard/advantech/pcm-5820/romstage.c | 2 +-
 src/mainboard/iei/juki-511p/romstage.c      | 2 +-
 src/superio/winbond/w83977f/Makefile.inc    | 2 +-
 src/superio/winbond/w83977f/early_serial.c  | 3 ++-
 src/superio/winbond/w83977f/w83977f.h       | 4 +++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/mainboard/advantech/pcm-5820/romstage.c b/src/mainboard/advantech/pcm-5820/romstage.c
index b710aad..1262300 100644
--- a/src/mainboard/advantech/pcm-5820/romstage.c
+++ b/src/mainboard/advantech/pcm-5820/romstage.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include "northbridge/amd/gx1/raminit.c"
 #include "cpu/x86/bist.h"
-#include "superio/winbond/w83977f/early_serial.c"
+#include <superio/winbond/w83977f/w83977f.h>
 #include "southbridge/amd/cs5530/enable_rom.c"

#define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1)
diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c
index 8b26b40..ac88e54 100644
--- a/src/mainboard/iei/juki-511p/romstage.c
+++ b/src/mainboard/iei/juki-511p/romstage.c
@@ -24,7 +24,7 @@
 #include <device/pnp_def.h>
 #include <arch/hlt.h>
 #include <console/console.h>
-#include "superio/winbond/w83977f/early_serial.c"
+#include <superio/winbond/w83977f/w83977f.h>
 #include "southbridge/amd/cs5530/enable_rom.c"
 #include "cpu/x86/bist.h"
 #include "drivers/pc80/udelay_io.c"
diff --git a/src/superio/winbond/w83977f/Makefile.inc b/src/superio/winbond/w83977f/Makefile.inc
index e52c09d..60edac9 100644
--- a/src/superio/winbond/w83977f/Makefile.inc
+++ b/src/superio/winbond/w83977f/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##

+romstage-$(CONFIG_SUPERIO_WINBOND_W83977F) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.c
-
diff --git a/src/superio/winbond/w83977f/early_serial.c b/src/superio/winbond/w83977f/early_serial.c
index c572dcb..c412449 100644
--- a/src/superio/winbond/w83977f/early_serial.c
+++ b/src/superio/winbond/w83977f/early_serial.c
@@ -19,6 +19,7 @@
  */

#include <arch/io.h>
+#include <device/pnp.h>
 #include "w83977f.h"

static void pnp_enter_ext_func_mode(device_t dev)
@@ -34,7 +35,7 @@ static void pnp_exit_ext_func_mode(device_t dev)
    outb(0xaa, port);
 }

-static void w83977f_enable_serial(device_t dev, u16 iobase)
+void w83977f_enable_serial(device_t dev, u16 iobase)
 {
    pnp_enter_ext_func_mode(dev);
    pnp_set_logical_device(dev);
diff --git a/src/superio/winbond/w83977f/w83977f.h b/src/superio/winbond/w83977f/w83977f.h
index f2b68ed..44c6a4a 100644
--- a/src/superio/winbond/w83977f/w83977f.h
+++ b/src/superio/winbond/w83977f/w83977f.h
@@ -31,4 +31,6 @@
 #define W83977F_GPIO1	7	/* General Purpose I/O 1 */
 #define W83977F_GPIO2	8	/* General Purpose I/O 2 */

-#endif
+void w83977f_enable_serial(device_t dev, u16 iobase);
+
+#endif /* SUPERIO_WINBOND_W83977F_W83977F_H */