diff options
author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-03-29 20:28:03 +1100 |
---|---|---|
committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2014-03-31 01:05:40 +0200 |
commit | d3043313a91dff3bc2f879ffb3b4bf23a364d711 (patch) | |
tree | 04d7332c24c28c87ce2f44c190af9a6ed1c957f8 | |
parent | 01c44000bedc571b10bdae7d0acfba079a131e42 (diff) | |
download | coreboot-staging-d3043313a91dff3bc2f879ffb3b4bf23a364d711.zip coreboot-staging-d3043313a91dff3bc2f879ffb3b4bf23a364d711.tar.gz |
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)
-rw-r--r-- | src/mainboard/amd/persimmon/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/amd/south_station/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/via/epia-m850/Makefile.inc | 21 | ||||
-rw-r--r-- | src/mainboard/via/epia-m850/romstage.c | 3 | ||||
-rw-r--r-- | src/superio/fintek/f81865f/Makefile.inc | 1 | ||||
-rw-r--r-- | src/superio/fintek/f81865f/chip.h | 2 | ||||
-rw-r--r-- | src/superio/fintek/f81865f/early_serial.c (renamed from src/superio/fintek/f81865f/f81865f_early_serial.c) | 3 | ||||
-rw-r--r-- | src/superio/fintek/f81865f/f81865f.h | 4 |
8 files changed, 10 insertions, 28 deletions
diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c index 98c64ed..e082f60 100644 --- a/src/mainboard/amd/persimmon/romstage.c +++ b/src/mainboard/amd/persimmon/romstage.c @@ -31,7 +31,7 @@ #include <cpu/x86/mtrr.h> #include "agesawrapper.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 "drivers/pc80/i8254.c" #include "drivers/pc80/i8259.c" diff --git a/src/mainboard/amd/south_station/romstage.c b/src/mainboard/amd/south_station/romstage.c index 20c973c..5614f88 100644 --- a/src/mainboard/amd/south_station/romstage.c +++ b/src/mainboard/amd/south_station/romstage.c @@ -32,7 +32,7 @@ #include <cpu/x86/mtrr.h> #include "agesawrapper.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 <sb_cimx.h> #include "SBPLATFORM.h" diff --git a/src/mainboard/via/epia-m850/Makefile.inc b/src/mainboard/via/epia-m850/Makefile.inc deleted file mode 100644 index 9c6d31f..0000000 --- a/src/mainboard/via/epia-m850/Makefile.inc +++ /dev/null @@ -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 - diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c index 262bee7..22f5ed6 100644 --- a/src/mainboard/via/epia-m850/romstage.c +++ b/src/mainboard/via/epia-m850/romstage.c @@ -36,8 +36,7 @@ #include "northbridge/via/vx900/early_vx900.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_early_serial.c" +#include <superio/fintek/f81865f/f81865f.h> #define SERIAL_DEV PNP_DEV(0x4e, 0x10) diff --git a/src/superio/fintek/f81865f/Makefile.inc b/src/superio/fintek/f81865f/Makefile.inc index 1700f7c..8afb286 100644 --- a/src/superio/fintek/f81865f/Makefile.inc +++ b/src/superio/fintek/f81865f/Makefile.inc @@ -18,4 +18,5 @@ ## 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 diff --git a/src/superio/fintek/f81865f/chip.h b/src/superio/fintek/f81865f/chip.h index fc17c0f..ae4da18 100644 --- a/src/superio/fintek/f81865f/chip.h +++ b/src/superio/fintek/f81865f/chip.h @@ -30,4 +30,4 @@ struct superio_fintek_f81865f_config { struct pc_keyboard keyboard; }; -#endif +#endif /* SUPERIO_FINTEK_F81865_CHIP_H */ diff --git a/src/superio/fintek/f81865f/f81865f_early_serial.c b/src/superio/fintek/f81865f/early_serial.c index 2989b5f..29b5f9d 100644 --- a/src/superio/fintek/f81865f/f81865f_early_serial.c +++ b/src/superio/fintek/f81865f/early_serial.c @@ -21,6 +21,7 @@ /* Pre-RAM driver for the Fintek F81865F/FG Super I/O chip. */ #include <arch/io.h> +#include <device/pnp.h> #include "f81865f.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 f81865f_enable_serial(device_t dev, u16 iobase) +void f81865f_enable_serial(device_t dev, u16 iobase) { pnp_enter_conf_state(dev); pnp_set_logical_device(dev); diff --git a/src/superio/fintek/f81865f/f81865f.h b/src/superio/fintek/f81865f/f81865f.h index 0c36571..ccf41af 100644 --- a/src/superio/fintek/f81865f/f81865f.h +++ b/src/superio/fintek/f81865f/f81865f.h @@ -35,4 +35,6 @@ #define F81865F_GPIO 0x06 /* General Purpose I/O (GPIO) */ #define F81865F_PME 0x0a /* Power Management Events (PME) */ -#endif +void f81865f_enable_serial(device_t dev, u16 iobase); + +#endif /* SUPERIO_FINTEK_F81865_F81865_H */ |