New patch to review for coreboot: 055f501 superio/nsc/pc97317: Use link-time symbols over .c inclusion

[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/8076

-gerrit

commit 055f501ac1aeacff9011c8815086e7c5a5f8e546
Author: Edward O'Callaghan 
Date:   Sun Jan 4 16:05:59 2015 +1100

superio/nsc/pc97317: Use link-time symbols over .c inclusion

Change-Id: Ia45bc7a880d0dab57c56a0452858cd26626f09df
    Signed-off-by: Edward O'Callaghan 
---
 src/mainboard/compaq/deskpro_en_sff_p600/romstage.c |  2 +-
 src/superio/nsc/pc97317/Makefile.inc                |  1 +
 src/superio/nsc/pc97317/early_serial.c              |  4 +++-
 src/superio/nsc/pc97317/pc97317.h                   | 11 ++++++++---
 src/superio/nsc/pc97317/superio.c                   |  1 -
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
index feccfb7..cfda5db 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
@@ -30,7 +30,7 @@
 #include "lib/delay.c"
 #include "cpu/x86/bist.h"
 /* FIXME: This should be PC97307 (but it's buggy at the moment)! */
-#include "superio/nsc/pc97317/early_serial.c"
+#include <superio/nsc/pc97317/pc97317.h>
 #include <lib.h>

/* FIXME: This should be PC97307 (but it's buggy at the moment)! */
diff --git a/src/superio/nsc/pc97317/Makefile.inc b/src/superio/nsc/pc97317/Makefile.inc
index c8f354c..6d729cf 100644
--- a/src/superio/nsc/pc97317/Makefile.inc
+++ b/src/superio/nsc/pc97317/Makefile.inc
@@ -18,4 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##

+romstage-$(CONFIG_SUPERIO_NSC_PC97317) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC97317) += superio.c
diff --git a/src/superio/nsc/pc97317/early_serial.c b/src/superio/nsc/pc97317/early_serial.c
index ad43010..f9bc69e 100644
--- a/src/superio/nsc/pc97317/early_serial.c
+++ b/src/superio/nsc/pc97317/early_serial.c
@@ -19,13 +19,15 @@
  */

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

#define PM_DEV PNP_DEV(0x2e, PC97317_PM)
 #define PM_BASE 0xe8

/* The PC97317 needs clocks to be set up before the serial port will operate. */
-static void pc97317_enable_serial(pnp_devfn_t dev, u16 iobase)
+void pc97317_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
    /* Set base address of power management unit. */
    pnp_set_logical_device(PM_DEV);
diff --git a/src/superio/nsc/pc97317/pc97317.h b/src/superio/nsc/pc97317/pc97317.h
index 8b57fc9..6938cb4 100644
--- a/src/superio/nsc/pc97317/pc97317.h
+++ b/src/superio/nsc/pc97317/pc97317.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */

-#ifndef SUPERIO_NSC_PC97317_PC97317_H
-#define SUPERIO_NSC_PC97317_PC97317_H
+#ifndef SUPERIO_NSC_PC97317_H
+#define SUPERIO_NSC_PC97317_H

#define PC97317_KBCK 0x00 /* Keyboard */
 #define PC97317_KBCM 0x01 /* Mouse */
@@ -31,4 +31,9 @@
 #define PC97317_GPIO 0x07
 #define PC97317_PM   0x08 /* Power Management */

-#endif
+#include <arch/io.h>
+#include <stdint.h>
+
+void pc97317_enable_serial(pnp_devfn_t dev, u16 iobase);
+
+#endif /* SUPERIO_NSC_PC97317_H */
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index b73dc7b..25b6162 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -28,7 +28,6 @@

static void init(struct device *dev)
 {
-
    if (!dev->enabled)
    	return;