superio/fintek/f81865f: Avoid .c includes
We should not be #include .c files, instead link early_serial into romstage and provide a prototype. Change-Id: Ia9277169ce1592e1fc72f8849f0982741daec567 Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-on: http://review.coreboot.org/5416 Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Tested-by: build bot (Jenkins)
This commit is contained in:
parent
01c44000be
commit
d3043313a9
|
@ -31,7 +31,7 @@
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
#include "agesawrapper.h"
|
#include "agesawrapper.h"
|
||||||
#include "cpu/x86/bist.h"
|
#include "cpu/x86/bist.h"
|
||||||
#include "superio/fintek/f81865f/f81865f_early_serial.c"
|
#include <superio/fintek/f81865f/f81865f.h>
|
||||||
#include "cpu/x86/lapic.h"
|
#include "cpu/x86/lapic.h"
|
||||||
#include "drivers/pc80/i8254.c"
|
#include "drivers/pc80/i8254.c"
|
||||||
#include "drivers/pc80/i8259.c"
|
#include "drivers/pc80/i8259.c"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
#include "agesawrapper.h"
|
#include "agesawrapper.h"
|
||||||
#include "cpu/x86/bist.h"
|
#include "cpu/x86/bist.h"
|
||||||
#include "superio/fintek/f81865f/f81865f_early_serial.c"
|
#include <superio/fintek/f81865f/f81865f.h>
|
||||||
#include "cpu/x86/lapic.h"
|
#include "cpu/x86/lapic.h"
|
||||||
#include <sb_cimx.h>
|
#include <sb_cimx.h>
|
||||||
#include "SBPLATFORM.h"
|
#include "SBPLATFORM.h"
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
##
|
|
||||||
## This file is part of the coreboot project.
|
|
||||||
##
|
|
||||||
## Copyright (C) 2011 Alexandru Gagniuc <mr.nuke.me@gmail.com>
|
|
||||||
##
|
|
||||||
## This program is free software: you can redistribute it and/or modify
|
|
||||||
## it under the terms of the GNU General Public License as published by
|
|
||||||
## the Free Software Foundation, either version 2 of the License, or
|
|
||||||
## (at your option) any later version.
|
|
||||||
##
|
|
||||||
## This program is distributed in the hope that it will be useful,
|
|
||||||
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
## GNU General Public License for more details.
|
|
||||||
##
|
|
||||||
## You should have received a copy of the GNU General Public License
|
|
||||||
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
##
|
|
||||||
|
|
||||||
#romstage-y += ./../../../superio/fintek/f81865f/f81865f_early_serial.c
|
|
||||||
|
|
|
@ -36,8 +36,7 @@
|
||||||
|
|
||||||
#include "northbridge/via/vx900/early_vx900.h"
|
#include "northbridge/via/vx900/early_vx900.h"
|
||||||
#include "northbridge/via/vx900/raminit.h"
|
#include "northbridge/via/vx900/raminit.h"
|
||||||
/* FIXME: This is the only .c include we couldn't get rid of */
|
#include <superio/fintek/f81865f/f81865f.h>
|
||||||
#include "superio/fintek/f81865f/f81865f_early_serial.c"
|
|
||||||
|
|
||||||
#define SERIAL_DEV PNP_DEV(0x4e, 0x10)
|
#define SERIAL_DEV PNP_DEV(0x4e, 0x10)
|
||||||
|
|
||||||
|
|
|
@ -18,4 +18,5 @@
|
||||||
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
##
|
##
|
||||||
|
|
||||||
|
romstage-$(CONFIG_SUPERIO_FINTEK_F81865F) += early_serial.c
|
||||||
ramstage-$(CONFIG_SUPERIO_FINTEK_F81865F) += superio.c
|
ramstage-$(CONFIG_SUPERIO_FINTEK_F81865F) += superio.c
|
||||||
|
|
|
@ -30,4 +30,4 @@ struct superio_fintek_f81865f_config {
|
||||||
struct pc_keyboard keyboard;
|
struct pc_keyboard keyboard;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif /* SUPERIO_FINTEK_F81865_CHIP_H */
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
/* Pre-RAM driver for the Fintek F81865F/FG Super I/O chip. */
|
/* Pre-RAM driver for the Fintek F81865F/FG Super I/O chip. */
|
||||||
|
|
||||||
#include <arch/io.h>
|
#include <arch/io.h>
|
||||||
|
#include <device/pnp.h>
|
||||||
#include "f81865f.h"
|
#include "f81865f.h"
|
||||||
|
|
||||||
static void pnp_enter_conf_state(device_t dev)
|
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);
|
outb(0xaa, port);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void f81865f_enable_serial(device_t dev, u16 iobase)
|
void f81865f_enable_serial(device_t dev, u16 iobase)
|
||||||
{
|
{
|
||||||
pnp_enter_conf_state(dev);
|
pnp_enter_conf_state(dev);
|
||||||
pnp_set_logical_device(dev);
|
pnp_set_logical_device(dev);
|
|
@ -35,4 +35,6 @@
|
||||||
#define F81865F_GPIO 0x06 /* General Purpose I/O (GPIO) */
|
#define F81865F_GPIO 0x06 /* General Purpose I/O (GPIO) */
|
||||||
#define F81865F_PME 0x0a /* Power Management Events (PME) */
|
#define F81865F_PME 0x0a /* Power Management Events (PME) */
|
||||||
|
|
||||||
#endif
|
void f81865f_enable_serial(device_t dev, u16 iobase);
|
||||||
|
|
||||||
|
#endif /* SUPERIO_FINTEK_F81865_F81865_H */
|
||||||
|
|
Loading…
Reference in New Issue