Patch set updated for coreboot: 96d692d superio/nsc/pc87360: Use link-time symbol over .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/8053

-gerrit

commit 96d692d62e80dc92f63b8dc21d23a17a12cb4c28
Author: Edward O'Callaghan 
Date:   Sun Jan 4 04:09:55 2015 +1100

superio/nsc/pc87360: Use link-time symbol over .c includes

Change-Id: Id6d9efc93fdaff63dcaab50712ac9be35ccb42a7
    Signed-off-by: Edward O'Callaghan 
---
 src/mainboard/arima/hdama/romstage.c        |  2 +-
 src/mainboard/hp/e_vectra_p2706t/romstage.c |  2 +-
 src/superio/nsc/pc87360/Makefile.inc        |  1 +
 src/superio/nsc/pc87360/early_serial.c      |  4 +++-
 src/superio/nsc/pc87360/pc87360.h           | 11 ++++++++---
 src/superio/nsc/pc87360/superio.c           |  1 -
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/mainboard/arima/hdama/romstage.c b/src/mainboard/arima/hdama/romstage.c
index 3c7eb58..137d3eb 100644
--- a/src/mainboard/arima/hdama/romstage.c
+++ b/src/mainboard/arima/hdama/romstage.c
@@ -12,7 +12,7 @@
 #include "lib/delay.c"
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
-#include "superio/nsc/pc87360/early_serial.c"
+#include <superio/nsc/pc87360/pc87360.h>
 #include "cpu/x86/bist.h"
 #include "northbridge/amd/amdk8/setup_resource_map.c"
 #include <spd.h>
diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c
index baa1995..f54e0e8 100644
--- a/src/mainboard/hp/e_vectra_p2706t/romstage.c
+++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <console/console.h>
 /* TODO: It's a PC87364 actually! */
-#include "superio/nsc/pc87360/early_serial.c"
+#include <superio/nsc/pc87360/pc87360.h>
 /* TODO: It's i810E actually! */
 #include "northbridge/intel/i82810/raminit.h"
 #include "cpu/x86/bist.h"
diff --git a/src/superio/nsc/pc87360/Makefile.inc b/src/superio/nsc/pc87360/Makefile.inc
index 579b14e..cb504f7 100644
--- a/src/superio/nsc/pc87360/Makefile.inc
+++ b/src/superio/nsc/pc87360/Makefile.inc
@@ -19,4 +19,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##

+romstage-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC87360) += superio.c
diff --git a/src/superio/nsc/pc87360/early_serial.c b/src/superio/nsc/pc87360/early_serial.c
index 3deac3b..2790df2 100644
--- a/src/superio/nsc/pc87360/early_serial.c
+++ b/src/superio/nsc/pc87360/early_serial.c
@@ -20,9 +20,11 @@
  */

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

-static void pc87360_enable_serial(pnp_devfn_t dev, u16 iobase)
+void pc87360_enable_serial(pnp_devfn_t dev, u16 iobase)
 {
    pnp_set_logical_device(dev);
    pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87360/pc87360.h b/src/superio/nsc/pc87360/pc87360.h
index 9843984..f006943 100644
--- a/src/superio/nsc/pc87360/pc87360.h
+++ b/src/superio/nsc/pc87360/pc87360.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */

-#ifndef SUPERIO_NSC_PC87360_PC87360_H
-#define SUPERIO_NSC_PC87360_PC87360_H
+#ifndef SUPERIO_NSC_PC87360_H
+#define SUPERIO_NSC_PC87360_H

#define PC87360_FDC  0x00 /* Floppy */
 #define PC87360_PP   0x01 /* Parallel port */
@@ -34,4 +34,9 @@
 #define PC87360_FSCM 0x09
 #define PC87360_WDT  0x0A

-#endif
+#include <arch/io.h>
+#include <stdint.h>
+
+void pc87360_enable_serial(pnp_devfn_t dev, u16 iobase);
+
+#endif /* SUPERIO_NSC_PC87360_H */
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 58e0802..5706014 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -30,7 +30,6 @@

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