Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8078
-gerrit
commit 1d266ec737d7c11e04b840225c9ab65f68292b8f Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Sun Jan 4 16:17:54 2015 +1100
superio/nsc/pc87417: Use link-time symbols over .c inclusion
Change-Id: I2efb7ab4b69bcd127b2faf54277dc229c9dcf3ea Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/mainboard/broadcom/blast/romstage.c | 2 +- src/mainboard/hp/dl145_g3/romstage.c | 2 +- src/mainboard/hp/dl165_g6_fam10/romstage.c | 2 +- src/mainboard/msi/ms9185/romstage.c | 2 +- src/superio/nsc/pc87417/Makefile.inc | 2 ++ src/superio/nsc/pc87417/early_init.c | 8 ++++---- src/superio/nsc/pc87417/early_serial.c | 8 ++------ src/superio/nsc/pc87417/pc87417.h | 12 +++++++----- src/superio/nsc/pc87417/superio.c | 1 - 9 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/mainboard/broadcom/blast/romstage.c b/src/mainboard/broadcom/blast/romstage.c index 03cdc1d..a97c3b8 100644 --- a/src/mainboard/broadcom/blast/romstage.c +++ b/src/mainboard/broadcom/blast/romstage.c @@ -14,7 +14,7 @@ #include "cpu/x86/lapic.h" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" -#include "superio/nsc/pc87417/early_serial.c" +#include <superio/nsc/pc87417/pc87417.h> #include "cpu/x86/bist.h" #include "northbridge/amd/amdk8/setup_resource_map.c" #include "southbridge/broadcom/bcm5785/early_setup.c" diff --git a/src/mainboard/hp/dl145_g3/romstage.c b/src/mainboard/hp/dl145_g3/romstage.c index 9deaaba..474f273 100644 --- a/src/mainboard/hp/dl145_g3/romstage.c +++ b/src/mainboard/hp/dl145_g3/romstage.c @@ -41,7 +41,7 @@ #include "cpu/x86/lapic.h" #include "northbridge/amd/amdk8/reset_test.c" #include <superio/serverengines/pilot/pilot.h> -#include "superio/nsc/pc87417/early_serial.c" +#include <superio/nsc/pc87417/pc87417.h> #include "cpu/x86/bist.h" #include "northbridge/amd/amdk8/debug.c" #include "northbridge/amd/amdk8/setup_resource_map.c" diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c index a2269a6..9e10360 100644 --- a/src/mainboard/hp/dl165_g6_fam10/romstage.c +++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c @@ -47,7 +47,7 @@ #include "cpu/x86/lapic.h" #include "northbridge/amd/amdfam10/reset_test.c" #include <superio/serverengines/pilot/pilot.h> -#include "superio/nsc/pc87417/early_serial.c" +#include <superio/nsc/pc87417/pc87417.h> #include "cpu/x86/bist.h" #include "northbridge/amd/amdfam10/debug.c" #include "southbridge/broadcom/bcm5785/early_setup.c" diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c index aabc826..bd82436 100644 --- a/src/mainboard/msi/ms9185/romstage.c +++ b/src/mainboard/msi/ms9185/romstage.c @@ -40,7 +40,7 @@ #include "cpu/x86/lapic.h" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" -#include "superio/nsc/pc87417/early_serial.c" +#include <superio/nsc/pc87417/pc87417.h> #include "cpu/x86/bist.h" #include "northbridge/amd/amdk8/setup_resource_map.c" #include "southbridge/broadcom/bcm5785/early_setup.c" diff --git a/src/superio/nsc/pc87417/Makefile.inc b/src/superio/nsc/pc87417/Makefile.inc index 8062a79..58d4eb5 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 42f8cd1..af7536b 100644 --- a/src/superio/nsc/pc87417/early_init.c +++ b/src/superio/nsc/pc87417/early_init.c @@ -21,19 +21,19 @@ */
#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); }
diff --git a/src/superio/nsc/pc87417/early_serial.c b/src/superio/nsc/pc87417/early_serial.c index 42ba941..69a7739 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 e7d5413..4a0131b 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,11 @@ #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 +#endif /* SUPERIO_NSC_PC87417_H */ diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c index 2295f29..15bd0ea 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;