Patch set updated for coreboot: amd/thatcher: Removed #include early_serial.c from romstage

[Antonello Dettori]

Antonello Dettori ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13887

-gerrit

commit 19f20eec7bf86e9167fb538a41b5b4b6ce25c079
Author: Antonello Dettori 
Date:   Thu Mar 3 16:25:35 2016 +0000

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 
---
 src/mainboard/amd/thatcher/romstage.c     | 3 ++-
 src/superio/smsc/lpc47n217/Makefile.inc   | 2 ++
 src/superio/smsc/lpc47n217/early_serial.c | 3 ++-
 src/superio/smsc/lpc47n217/lpc47n217.h    | 6 ++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index 10b7df1..11997bc 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -2,6 +2,7 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2012 Advanced Micro Devices, Inc.
+ * Copyright (C) 2016 Antonello Dettori 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +31,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 f3c5ad4..df9f1b5 100644
--- a/src/superio/smsc/lpc47n217/Makefile.inc
+++ b/src/superio/smsc/lpc47n217/Makefile.inc
@@ -2,6 +2,7 @@
 ## This file is part of the coreboot project.
 ##
 ## Copyright (C) 2005 Digital Design Corporation
+## Copyright (C) 2016 Antonello Dettori 
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -14,4 +15,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 dfe06b9..8944b26 100644
--- a/src/superio/smsc/lpc47n217/early_serial.c
+++ b/src/superio/smsc/lpc47n217/early_serial.c
@@ -2,6 +2,7 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2005 Digital Design Corporation
+ * Copyright (C) 2016 Antonello Dettori 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -105,7 +106,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 20689d1..cc38a3c 100644
--- a/src/superio/smsc/lpc47n217/lpc47n217.h
+++ b/src/superio/smsc/lpc47n217/lpc47n217.h
@@ -2,6 +2,7 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2005 Digital Design Corporation
+ * Copyright (C) 2016 Antonello Dettori 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +18,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 +31,6 @@

#define LPC47N217_MAX_CONFIG_REGISTER	0x39

+void lpc47n217_enable_serial(pnp_devfn_t dev, u16 iobase);
+
 #endif