Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5924
-gerrit
commit dd949df83576a8d67cfdf3e4db057ce84f9404e9 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Tue Jun 3 08:40:34 2014 +1000
src/superio/smsc/lpc47m15x: Avoid #include early_serial.c
Provide proper header and function type-signatures for Super I/O romstage component.
Change-Id: Icd02199690d0c428b2daadf702d50714dc367692 Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/mainboard/intel/d945gclf/romstage.c | 3 +-- src/superio/smsc/lpc47m15x/Makefile.inc | 2 +- src/superio/smsc/lpc47m15x/early_serial.c | 5 ++++- src/superio/smsc/lpc47m15x/lpc47m15x.h | 11 ++++++++--- 4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c index 69d4232..0345c10 100644 --- a/src/mainboard/intel/d945gclf/romstage.c +++ b/src/mainboard/intel/d945gclf/romstage.c @@ -27,11 +27,10 @@ #include <cpu/x86/lapic.h> #include <lib.h> #include <cbmem.h> -#include "superio/smsc/lpc47m15x/lpc47m15x.h" +#include <superio/smsc/lpc47m15x/lpc47m15x.h> #include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> -#include "superio/smsc/lpc47m15x/early_serial.c" #include "northbridge/intel/i945/i945.h" #include "northbridge/intel/i945/raminit.h" #include "southbridge/intel/i82801gx/i82801gx.h" diff --git a/src/superio/smsc/lpc47m15x/Makefile.inc b/src/superio/smsc/lpc47m15x/Makefile.inc index d5b69e4..610d87c 100644 --- a/src/superio/smsc/lpc47m15x/Makefile.inc +++ b/src/superio/smsc/lpc47m15x/Makefile.inc @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ##
+romstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += early_serial.c ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.c - diff --git a/src/superio/smsc/lpc47m15x/early_serial.c b/src/superio/smsc/lpc47m15x/early_serial.c index 7d75bae..5686f52 100644 --- a/src/superio/smsc/lpc47m15x/early_serial.c +++ b/src/superio/smsc/lpc47m15x/early_serial.c @@ -20,6 +20,9 @@ /* Pre-RAM driver for the SMSC LPC47M15X Super I/O chip */
#include <arch/io.h> +#include <device/pnp.h> +#include <stdint.h> + #include "lpc47m15x.h"
static void pnp_enter_conf_state(device_t dev) @@ -34,7 +37,7 @@ static void pnp_exit_conf_state(device_t dev) outb(0xaa, port); }
-static inline void lpc47m15x_enable_serial(device_t dev, u16 iobase) +void lpc47m15x_enable_serial(device_t dev, u16 iobase) { pnp_enter_conf_state(dev); pnp_set_logical_device(dev); diff --git a/src/superio/smsc/lpc47m15x/lpc47m15x.h b/src/superio/smsc/lpc47m15x/lpc47m15x.h index 04f1729..32cff48 100644 --- a/src/superio/smsc/lpc47m15x/lpc47m15x.h +++ b/src/superio/smsc/lpc47m15x/lpc47m15x.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#ifndef SUPERIO_SMSC_LPC47M15X_LPC47M15X_H -#define SUPERIO_SMSC_LPC47M15X_LPC47M15X_H +#ifndef SUPERIO_SMSC_LPC47M15X_H +#define SUPERIO_SMSC_LPC47M15X_H
#define LPC47M15X_FDC 0 /* Floppy */ #define LPC47M15X_PP 3 /* Parallel Port */ @@ -31,4 +31,9 @@
#define LPC47M15X2_MAX_CONFIG_REGISTER 0x5F
-#endif +#include <arch/io.h> +#include <stdint.h> + +void lpc47m15x_enable_serial(device_t dev, u16 iobase); + +#endif /* SUPERIO_SMSC_LPC47M15X_H */