summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonello Dettori <dev@dettori.io>2016-03-03 16:25:35 +0000
committerPatrick Georgi <pgeorgi@google.com>2016-03-05 15:38:40 +0100
commitbc839fba3d4fd44d3d7b2dcfafc32bccf2af9c94 (patch)
treeadf8085231492a2147df211bb4151403bb7ec0ee
parent98b5f907ac6317a0e4fc11f429b7cfa858550964 (diff)
downloadcoreboot-bc839fba3d4fd44d3d7b2dcfafc32bccf2af9c94.tar.gz
coreboot-bc839fba3d4fd44d3d7b2dcfafc32bccf2af9c94.tar.bz2
coreboot-bc839fba3d4fd44d3d7b2dcfafc32bccf2af9c94.zip
amd/thatcher: Removed #include early_serial.c from romstage
Remove dependency on early_serial.c and instead use the Super I/O's header to access the functions needed. Change-Id: I9edf7fc2501aa832106dda9213e702dbcc1200b4 Signed-off-by: Antonello Dettori <dev@dettori.io> Reviewed-on: https://review.coreboot.org/13887 Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins)
-rw-r--r--src/mainboard/amd/thatcher/romstage.c2
-rw-r--r--src/superio/smsc/lpc47n217/Makefile.inc1
-rw-r--r--src/superio/smsc/lpc47n217/early_serial.c2
-rw-r--r--src/superio/smsc/lpc47n217/lpc47n217.h5
4 files changed, 8 insertions, 2 deletions
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index 10b7df13e5cf..4c9c8fa1b39b 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -30,7 +30,7 @@
#include <cpu/x86/bist.h>
#include <cpu/x86/lapic.h>
#include <southbridge/amd/agesa/hudson/hudson.h>
-#include <superio/smsc/lpc47n217/early_serial.c>
+#include <superio/smsc/lpc47n217/lpc47n217.h>
#include <cpu/amd/agesa/s3_resume.h>
#include "cbmem.h"
diff --git a/src/superio/smsc/lpc47n217/Makefile.inc b/src/superio/smsc/lpc47n217/Makefile.inc
index f3c5ad469707..0bff637a2be6 100644
--- a/src/superio/smsc/lpc47n217/Makefile.inc
+++ b/src/superio/smsc/lpc47n217/Makefile.inc
@@ -14,4 +14,5 @@
## GNU General Public License for more details.
##
+romstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += early_serial.c
ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.c
diff --git a/src/superio/smsc/lpc47n217/early_serial.c b/src/superio/smsc/lpc47n217/early_serial.c
index dfe06b908285..454d77f0469e 100644
--- a/src/superio/smsc/lpc47n217/early_serial.c
+++ b/src/superio/smsc/lpc47n217/early_serial.c
@@ -105,7 +105,7 @@ static void lpc47n217_pnp_set_enable(pnp_devfn_t dev, int enable)
* @param dev High 8 bits = Super I/O port, low 8 bits = logical device number.
* @param iobase Processor I/O port address to assign to this serial device.
*/
-static void lpc47n217_enable_serial(pnp_devfn_t dev, u16 iobase)
+void lpc47n217_enable_serial(pnp_devfn_t dev, u16 iobase)
{
/*
* NOTE: Cannot use pnp_set_XXX() here because they assume chip
diff --git a/src/superio/smsc/lpc47n217/lpc47n217.h b/src/superio/smsc/lpc47n217/lpc47n217.h
index 20689d189a6e..1cae5a08b25c 100644
--- a/src/superio/smsc/lpc47n217/lpc47n217.h
+++ b/src/superio/smsc/lpc47n217/lpc47n217.h
@@ -17,6 +17,9 @@
#ifndef SUPERIO_SMSC_LPC47N217_LPC47N217_H
#define SUPERIO_SMSC_LPC47N217_LPC47N217_H
+#include <arch/io.h>
+#include <stdint.h>
+
/*
* These are arbitrary, but must match declarations in the mainboard
* devicetree.cb file. Values chosen to match SMSC LPC47B37x.
@@ -27,4 +30,6 @@
#define LPC47N217_MAX_CONFIG_REGISTER 0x39
+void lpc47n217_enable_serial(pnp_devfn_t dev, u16 iobase);
+
#endif