Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5417
-gerrit
commit 180427b29c0793d1252d300fe150155fd802e729 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Sat Mar 29 20:42:58 2014 +1100
superio/fintek/f71859: Let the linker do its job.
We should not be #include c files all around the shop.. Link early_serial into romstage and provide a prototype.
Change-Id: I3577ca3f761fb699dc51141a02e1f853bf1f1a21 Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/mainboard/iei/kino-780am2-fam10/romstage.c | 2 +- src/superio/fintek/f71859/Makefile.inc | 2 +- src/superio/fintek/f71859/early_serial.c | 3 ++- src/superio/fintek/f71859/f71859.h | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c index e5e2c57..8134053 100644 --- a/src/mainboard/iei/kino-780am2-fam10/romstage.c +++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c @@ -41,7 +41,7 @@ #include "northbridge/amd/amdfam10/reset_test.c" #include <console/loglevel.h> #include "cpu/x86/bist.h" -#include "superio/fintek/f71859/early_serial.c" +#include "superio/fintek/f71859/f71859.h" #include <cpu/amd/mtrr.h> #include "northbridge/amd/amdfam10/setup_resource_map.c" #include "southbridge/amd/rs780/early_setup.c" diff --git a/src/superio/fintek/f71859/Makefile.inc b/src/superio/fintek/f71859/Makefile.inc index bf150da..8858811 100644 --- a/src/superio/fintek/f71859/Makefile.inc +++ b/src/superio/fintek/f71859/Makefile.inc @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ##
+romstage-$(CONFIG_SUPERIO_FINTEK_F71859) += early_serial.c ramstage-$(CONFIG_SUPERIO_FINTEK_F71859) += superio.c - diff --git a/src/superio/fintek/f71859/early_serial.c b/src/superio/fintek/f71859/early_serial.c index 4401714..cb0d3de 100644 --- a/src/superio/fintek/f71859/early_serial.c +++ b/src/superio/fintek/f71859/early_serial.c @@ -21,6 +21,7 @@ /* Pre-RAM driver for the Fintek F71859 Super I/O chip. */
#include <arch/io.h> +#include <device/pnp.h> #include "f71859.h"
static void pnp_enter_conf_state(device_t dev) @@ -36,7 +37,7 @@ static void pnp_exit_conf_state(device_t dev) outb(0xaa, port); }
-static void f71859_enable_serial(device_t dev, u16 iobase) +void f71859_enable_serial(device_t dev, u16 iobase) { pnp_enter_conf_state(dev); pnp_set_logical_device(dev); diff --git a/src/superio/fintek/f71859/f71859.h b/src/superio/fintek/f71859/f71859.h index 2c89d19..580fa34 100644 --- a/src/superio/fintek/f71859/f71859.h +++ b/src/superio/fintek/f71859/f71859.h @@ -24,4 +24,6 @@ /* Logical Device Numbers (LDN). */ #define F71859_SP1 0x03 /* UART1 */
-#endif +void f71859_enable_serial(device_t dev, u16 iobase); + +#endif /* SUPERIO_FINTEK_F71859_F71859_H */