diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2015-01-04 16:17:54 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2015-01-04 13:48:03 +0100 |
| commit | b8f05d4faab11a7b726963dc3821a682281eea02 (patch) | |
| tree | 3d4352f5db4fd0ef6b4f6a50049ed0f96b2964c5 /src/superio/nsc | |
| parent | db1a2fb3df73fe65381b52089fb890ba3c4f5122 (diff) | |
| download | coreboot-b8f05d4faab11a7b726963dc3821a682281eea02.tar.xz | |
superio/nsc/pc87417: Use link-time symbols over .c inclusion
Change-Id: I2efb7ab4b69bcd127b2faf54277dc229c9dcf3ea
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/8078
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/superio/nsc')
| -rw-r--r-- | src/superio/nsc/pc87417/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/superio/nsc/pc87417/early_init.c | 12 | ||||
| -rw-r--r-- | src/superio/nsc/pc87417/early_serial.c | 8 | ||||
| -rw-r--r-- | src/superio/nsc/pc87417/pc87417.h | 14 | ||||
| -rw-r--r-- | src/superio/nsc/pc87417/superio.c | 1 |
5 files changed, 19 insertions, 18 deletions
diff --git a/src/superio/nsc/pc87417/Makefile.inc b/src/superio/nsc/pc87417/Makefile.inc index 8062a79315..58d4eb56d4 100644 --- a/src/superio/nsc/pc87417/Makefile.inc +++ b/src/superio/nsc/pc87417/Makefile.inc @@ -20,4 +20,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c +romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_serial.c ramstage-$(CONFIG_SUPERIO_NSC_PC87417) += superio.c diff --git a/src/superio/nsc/pc87417/early_init.c b/src/superio/nsc/pc87417/early_init.c index 42f8cd15c8..4e6b76cd3a 100644 --- a/src/superio/nsc/pc87417/early_init.c +++ b/src/superio/nsc/pc87417/early_init.c @@ -21,25 +21,25 @@ */ #include <arch/io.h> +#include <device/pnp.h> +#include <stdint.h> #include "pc87417.h" -static void pc87417_disable_dev(pnp_devfn_t dev) +void pc87417_disable_dev(pnp_devfn_t dev) { pnp_set_logical_device(dev); pnp_set_enable(dev, 0); } -static void pc87417_enable_dev(pnp_devfn_t dev, u16 iobase) +void pc87417_enable_dev(pnp_devfn_t dev) { pnp_set_logical_device(dev); - pnp_set_enable(dev, 0); - pnp_set_iobase(dev, PNP_IDX_IO0, iobase); pnp_set_enable(dev, 1); } -static void xbus_cfg(pnp_devfn_t dev) +void xbus_cfg(pnp_devfn_t dev) { - u8 i, data; + u8 i; u16 xbus_index; pnp_set_logical_device(dev); diff --git a/src/superio/nsc/pc87417/early_serial.c b/src/superio/nsc/pc87417/early_serial.c index 42ba941cb7..69a7739f2b 100644 --- a/src/superio/nsc/pc87417/early_serial.c +++ b/src/superio/nsc/pc87417/early_serial.c @@ -21,6 +21,8 @@ */ #include <arch/io.h> +#include <device/pnp.h> +#include <stdint.h> #include "pc87417.h" void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase) @@ -30,9 +32,3 @@ void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase) pnp_set_iobase(dev, PNP_IDX_IO0, iobase); pnp_set_enable(dev, 1); } - -void pc87417_enable_dev(pnp_devfn_t dev) -{ - pnp_set_logical_device(dev); - pnp_set_enable(dev, 1); -} diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h index e7d5413cc7..2e369cf9ce 100644 --- a/src/superio/nsc/pc87417/pc87417.h +++ b/src/superio/nsc/pc87417/pc87417.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_NSC_PC87417_PC87417_H -#define SUPERIO_NSC_PC87417_PC87417_H +#ifndef SUPERIO_NSC_PC87417_H +#define SUPERIO_NSC_PC87417_H #define PC87417_FDC 0x00 /* Floppy */ #define PC87417_PP 0x01 /* Parallel Port */ @@ -114,9 +114,13 @@ #define PC87417_XSCNF 0x15 #define PC87417_XWBCNF 0x16 -#if defined(__PRE_RAM__) +#include <arch/io.h> +#include <stdint.h> + void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase); +void pc87417_disable_dev(pnp_devfn_t dev); void pc87417_enable_dev(pnp_devfn_t dev); -#endif -#endif +void xbus_cfg(pnp_devfn_t dev); + +#endif /* SUPERIO_NSC_PC87417_H */ diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c index 2295f29f61..15bd0eab03 100644 --- a/src/superio/nsc/pc87417/superio.c +++ b/src/superio/nsc/pc87417/superio.c @@ -31,7 +31,6 @@ static void init(struct device *dev) { - if (!dev->enabled) return; |