diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-06-03 08:40:34 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-07-18 14:42:19 +0200 |
| commit | cf5ac3d7ef1a0f4876f1df7368d19d57d168bae4 (patch) | |
| tree | 22d2c603cef2ac2b014153c33e4fbd7466e7b271 /src/superio/smsc | |
| parent | 031cf214c6626677312f25cd17ed391d8aec4b79 (diff) | |
src/superio/smsc/lpc47m15x: Avoid #include early_serial.c
Provide proper header and function type-signatures for Super I/O
romstage component.
Fix mainboard's bogous romstage component to match.
Change-Id: Icd02199690d0c428b2daadf702d50714dc367692
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5924
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src/superio/smsc')
| -rw-r--r-- | src/superio/smsc/lpc47m15x/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/superio/smsc/lpc47m15x/early_serial.c | 5 | ||||
| -rw-r--r-- | src/superio/smsc/lpc47m15x/lpc47m15x.h | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/superio/smsc/lpc47m15x/Makefile.inc b/src/superio/smsc/lpc47m15x/Makefile.inc index c43e037a37..610d87cbce 100644 --- a/src/superio/smsc/lpc47m15x/Makefile.inc +++ b/src/superio/smsc/lpc47m15x/Makefile.inc @@ -17,4 +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 7d75baecbe..5686f52106 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 04f1729abe..32cff48f01 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 */ |