From 32da8d900e2ca5fa9fe95d30dd064d593b26002f Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Date: Thu, 29 May 2014 14:43:39 +1000
Subject: superio/nsc/pc87309: Avoid .c includes in mainboard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make superio romstage component link-time symbols.

Change-Id: Icde27465a05946498ff7b8f1aaa7a9e8ba074272
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5880
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
 src/superio/nsc/pc87309/Makefile.inc   |  2 +-
 src/superio/nsc/pc87309/early_serial.c |  3 ++-
 src/superio/nsc/pc87309/pc87309.h      | 11 ++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/superio/nsc')

diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc
index 145910f81c..b1396809ba 100644
--- a/src/superio/nsc/pc87309/Makefile.inc
+++ b/src/superio/nsc/pc87309/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
+romstage-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.c
-
diff --git a/src/superio/nsc/pc87309/early_serial.c b/src/superio/nsc/pc87309/early_serial.c
index 131f0aaeac..6e48e0c05f 100644
--- a/src/superio/nsc/pc87309/early_serial.c
+++ b/src/superio/nsc/pc87309/early_serial.c
@@ -19,9 +19,10 @@
  */
 
 #include <arch/io.h>
+#include <device/pnp_def.h>
 #include "pc87309.h"
 
-static void pc87309_enable_serial(device_t dev, u16 iobase)
+void pc87309_enable_serial(device_t dev, u16 iobase)
 {
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
diff --git a/src/superio/nsc/pc87309/pc87309.h b/src/superio/nsc/pc87309/pc87309.h
index 396aa783fe..5f39b6e121 100644
--- a/src/superio/nsc/pc87309/pc87309.h
+++ b/src/superio/nsc/pc87309/pc87309.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SUPERIO_NSC_PC87309_PC87309_H
-#define SUPERIO_NSC_PC87309_PC87309_H
+#ifndef SUPERIO_NSC_PC87309_H
+#define SUPERIO_NSC_PC87309_H
 
 /* Datasheet: PC87309 SuperI/O Plug and Play Compatible Chip. */
 
@@ -31,4 +31,9 @@
 #define PC87309_KBCM 0x05	/* Mouse */
 #define PC87309_KBCK 0x06	/* Keyboard */
 
-#endif
+#include <arch/io.h>
+#include <stdint.h>
+
+void pc87309_enable_serial(device_t dev, u16 iobase);
+
+#endif /* SUPERIO_NSC_PC87309_H */
-- 
cgit v1.2.3