diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2015-01-04 16:10:32 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2015-01-04 13:47:53 +0100 |
| commit | db1a2fb3df73fe65381b52089fb890ba3c4f5122 (patch) | |
| tree | 121eb4beb8ed3927fa43ef8cc1f239fd31eb9f52 | |
| parent | fc4e8550afc5aab4af7801e2e008a8712f8c7795 (diff) | |
superio/nsc/pc87366: Use link-time symbols over .c inclusion
Change-Id: Id156ca3c9a14c5bcc4d6cdb8434ca8efdac3139a
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/8077
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
| -rw-r--r-- | src/mainboard/ibm/e325/romstage.c | 2 | ||||
| -rw-r--r-- | src/mainboard/ibm/e326/romstage.c | 2 | ||||
| -rw-r--r-- | src/superio/nsc/pc87366/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/superio/nsc/pc87366/early_serial.c | 4 | ||||
| -rw-r--r-- | src/superio/nsc/pc87366/pc87366.h | 11 | ||||
| -rw-r--r-- | src/superio/nsc/pc87366/superio.c | 1 |
6 files changed, 14 insertions, 7 deletions
diff --git a/src/mainboard/ibm/e325/romstage.c b/src/mainboard/ibm/e325/romstage.c index b44668a5ca..4e1e925e74 100644 --- a/src/mainboard/ibm/e325/romstage.c +++ b/src/mainboard/ibm/e325/romstage.c @@ -13,7 +13,7 @@ #include "lib/delay.c" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" -#include "superio/nsc/pc87366/early_serial.c" +#include <superio/nsc/pc87366/pc87366.h> #include "cpu/x86/bist.h" #include "northbridge/amd/amdk8/setup_resource_map.c" #include <spd.h> diff --git a/src/mainboard/ibm/e326/romstage.c b/src/mainboard/ibm/e326/romstage.c index c703b7aff4..2ac90abf2e 100644 --- a/src/mainboard/ibm/e326/romstage.c +++ b/src/mainboard/ibm/e326/romstage.c @@ -13,7 +13,7 @@ #include "lib/delay.c" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" -#include "superio/nsc/pc87366/early_serial.c" +#include <superio/nsc/pc87366/pc87366.h> #include "cpu/x86/bist.h" #include "northbridge/amd/amdk8/setup_resource_map.c" #include "southbridge/amd/amd8111/early_ctrl.c" diff --git a/src/superio/nsc/pc87366/Makefile.inc b/src/superio/nsc/pc87366/Makefile.inc index 451f944cc9..37ea1d874a 100644 --- a/src/superio/nsc/pc87366/Makefile.inc +++ b/src/superio/nsc/pc87366/Makefile.inc @@ -19,4 +19,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +romstage-$(CONFIG_SUPERIO_NSC_PC87366) += early_serial.c ramstage-$(CONFIG_SUPERIO_NSC_PC87366) += superio.c diff --git a/src/superio/nsc/pc87366/early_serial.c b/src/superio/nsc/pc87366/early_serial.c index e663df6021..6cbef411b3 100644 --- a/src/superio/nsc/pc87366/early_serial.c +++ b/src/superio/nsc/pc87366/early_serial.c @@ -20,9 +20,11 @@ */ #include <arch/io.h> +#include <device/pnp.h> +#include <stdint.h> #include "pc87366.h" -static void pc87366_enable_serial(pnp_devfn_t dev, u16 iobase) +void pc87366_enable_serial(pnp_devfn_t dev, u16 iobase) { pnp_set_logical_device(dev); pnp_set_enable(dev, 0); diff --git a/src/superio/nsc/pc87366/pc87366.h b/src/superio/nsc/pc87366/pc87366.h index 8a1ede7a67..dea8ddf610 100644 --- a/src/superio/nsc/pc87366/pc87366.h +++ b/src/superio/nsc/pc87366/pc87366.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_NSC_PC87366_PC87366_H -#define SUPERIO_NSC_PC87366_PC87366_H +#ifndef SUPERIO_NSC_PC87366_H +#define SUPERIO_NSC_PC87366_H #define PC87366_FDC 0x00 /* Floppy */ #define PC87366_PP 0x01 /* Parallel port */ @@ -38,4 +38,9 @@ #define PC87366_VLM 0x0D #define PC87366_TMS 0x0E -#endif +#include <arch/io.h> +#include <stdint.h> + +void pc87366_enable_serial(pnp_devfn_t dev, u16 iobase); + +#endif /* SUPERIO_NSC_PC87366_H */ diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c index 9cfba04c97..9bf14fc9d2 100644 --- a/src/superio/nsc/pc87366/superio.c +++ b/src/superio/nsc/pc87366/superio.c @@ -30,7 +30,6 @@ static void init(struct device *dev) { - if (!dev->enabled) return; |