diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-02-17 21:34:42 +0200 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-03-04 15:26:08 +0100 |
commit | 1d7541feeba372ec3d1d441442238e1c65972bd7 (patch) | |
tree | 03e53d513aa89deaf15e2751cd247cc9cb3d7037 | |
parent | 7e75f20477511c48f47416caed7301e852165a7f (diff) | |
download | coreboot-staging-1d7541feeba372ec3d1d441442238e1c65972bd7.zip coreboot-staging-1d7541feeba372ec3d1d441442238e1c65972bd7.tar.gz |
console: Fix includes
Do not pull in console hw-specific prototypes everywhere
with console.h as those are not needed for higher levels.
Move prototypes for UARTs next to other consoles.
Change-Id: Icbc9cd3e5bdfdab85d7dccd7c3827bba35248fb8
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5232
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
28 files changed, 40 insertions, 43 deletions
diff --git a/src/arch/armv7/early_console.c b/src/arch/armv7/early_console.c index b6339fc..93ea38d 100644 --- a/src/arch/armv7/early_console.c +++ b/src/arch/armv7/early_console.c @@ -18,6 +18,8 @@ */ #include <console/console.h> +#include <console/cbmem_console.h> +#include <console/uart.h> #include <console/vtxprintf.h> /* FIXME: need to make console driver more generic */ diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c index c5e6882..52b8a87 100644 --- a/src/arch/x86/lib/romcc_console.c +++ b/src/arch/x86/lib/romcc_console.c @@ -20,6 +20,7 @@ #include <stdint.h> #include <console/loglevel.h> #include <console/post_codes.h> +#include <console/ne2k.h> /* __PRE_RAM__ */ /* Using a global varible can cause problems when we reset the stack diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c index 4ef702f..4981f39 100644 --- a/src/arch/x86/lib/romstage_console.c +++ b/src/arch/x86/lib/romstage_console.c @@ -19,20 +19,16 @@ #include <smp/node.h> #include <console/console.h> +#include <console/cbmem_console.h> +#include <console/uart.h> +#include <console/usb.h> +#include <console/ne2k.h> +#include <console/spkmodem.h> #include <console/vtxprintf.h> #if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM #include <uart8250.h> #endif -#if CONFIG_USBDEBUG -#include <console/usb.h> -#endif -#if CONFIG_CONSOLE_NE2K -#include <console/ne2k.h> -#endif -#if CONFIG_SPKMODEM -#include <console/spkmodem.h> -#endif void console_tx_byte(unsigned char byte) { diff --git a/src/console/cbmem_console.c b/src/console/cbmem_console.c index 2c43f5c..870ce2f 100644 --- a/src/console/cbmem_console.c +++ b/src/console/cbmem_console.c @@ -18,6 +18,7 @@ */ #include <console/console.h> +#include <console/cbmem_console.h> static void cbmemc_init_(void) { diff --git a/src/console/console.c b/src/console/console.c index 081113c..334e140 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -18,6 +18,12 @@ */ #include <console/console.h> +#include <console/cbmem_console.h> +#include <console/uart.h> +#include <console/usb.h> +#include <console/ne2k.h> +#include <console/spkmodem.h> + #include <build.h> #include <arch/hlt.h> #include <arch/io.h> diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c index 196412c..86f1401 100644 --- a/src/console/uart8250_console.c +++ b/src/console/uart8250_console.c @@ -18,6 +18,7 @@ */ #include <console/console.h> +#include <console/uart.h> #include <uart8250.h> static void ttyS0_init(void) diff --git a/src/console/uart8250mem_console.c b/src/console/uart8250mem_console.c index 3833e47..eb4e0e0 100644 --- a/src/console/uart8250mem_console.c +++ b/src/console/uart8250mem_console.c @@ -18,6 +18,7 @@ */ #include <console/console.h> +#include <console/uart.h> #include <uart8250.h> static u32 uart_bar = 0; diff --git a/src/cpu/allwinner/a10/uart.c b/src/cpu/allwinner/a10/uart.c index 990026b..10ea09a 100644 --- a/src/cpu/allwinner/a10/uart.c +++ b/src/cpu/allwinner/a10/uart.c @@ -7,7 +7,7 @@ #include "uart.h" #include <arch/io.h> -#include <uart.h> +#include <console/uart.h> #include <uart8250.h> /** diff --git a/src/cpu/allwinner/a10/uart_console.c b/src/cpu/allwinner/a10/uart_console.c index f7bd3c6..af66cb7 100644 --- a/src/cpu/allwinner/a10/uart_console.c +++ b/src/cpu/allwinner/a10/uart_console.c @@ -8,7 +8,7 @@ #include <config.h> #include <types.h> -#include <uart.h> +#include <console/uart.h> #include <arch/io.h> #include <console/console.h> diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/cpu/samsung/exynos5250/uart.c index 10108a8..c9d8d25 100644 --- a/src/cpu/samsung/exynos5250/uart.c +++ b/src/cpu/samsung/exynos5250/uart.c @@ -18,7 +18,7 @@ */ #include <console/console.h> /* for __console definition */ -#include <uart.h> +#include <console/uart.h> #include <arch/io.h> #include "uart.h" #include "clk.h" diff --git a/src/cpu/samsung/exynos5420/uart.c b/src/cpu/samsung/exynos5420/uart.c index 2ca8271..f9dd268 100644 --- a/src/cpu/samsung/exynos5420/uart.c +++ b/src/cpu/samsung/exynos5420/uart.c @@ -18,7 +18,7 @@ */ #include <console/console.h> /* for __console definition */ -#include <uart.h> +#include <console/uart.h> #include <arch/io.h> #include "uart.h" #include "clk.h" diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c index 719215e..f6f1a8d 100644 --- a/src/cpu/ti/am335x/uart.c +++ b/src/cpu/ti/am335x/uart.c @@ -18,7 +18,7 @@ #include <config.h> #include <types.h> -#include <uart.h> +#include <console/uart.h> #include <arch/io.h> #include <console/console.h> /* for __console definition */ diff --git a/src/cpu/x86/smm/smiutil.c b/src/cpu/x86/smm/smiutil.c index a50a16a..98ef223 100644 --- a/src/cpu/x86/smm/smiutil.c +++ b/src/cpu/x86/smm/smiutil.c @@ -23,7 +23,7 @@ #include <cpu/x86/cache.h> #include <cpu/x86/smm.h> #include <console/console.h> -#include <uart.h> +#include <console/uart.h> #include <uart8250.h> #include <console/vtxprintf.h> diff --git a/src/drivers/oxford/oxpcie/oxpcie.c b/src/drivers/oxford/oxpcie/oxpcie.c index f719fc7..26d29f8 100644 --- a/src/drivers/oxford/oxpcie/oxpcie.c +++ b/src/drivers/oxford/oxpcie/oxpcie.c @@ -22,6 +22,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <console/console.h> +#include <uart8250.h> #include <arch/io.h> static void oxford_oxpcie_enable(device_t dev) diff --git a/src/drivers/oxford/oxpcie/oxpcie_early.c b/src/drivers/oxford/oxpcie/oxpcie_early.c index 4f6f964..edb0523 100644 --- a/src/drivers/oxford/oxpcie/oxpcie_early.c +++ b/src/drivers/oxford/oxpcie/oxpcie_early.c @@ -21,7 +21,7 @@ #include <arch/io.h> #include <arch/early_variables.h> #include <delay.h> -#include <uart.h> +#include <console/uart.h> #include <uart8250.h> #include <device/pci_def.h> diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c index af085ac..376e95c 100644 --- a/src/drivers/uart/pl011.c +++ b/src/drivers/uart/pl011.c @@ -14,7 +14,7 @@ */ #include <console/console.h> -#include <uart.h> +#include <console/uart.h> static void pl011_uart_tx_byte(unsigned char data) { diff --git a/src/drivers/uart/util.c b/src/drivers/uart/util.c index e09b686..72bf50e 100644 --- a/src/drivers/uart/util.c +++ b/src/drivers/uart/util.c @@ -16,7 +16,7 @@ */ #include <console/console.h> -#include <uart.h> +#include <console/uart.h> #if CONFIG_USE_OPTION_TABLE #include <option.h> #include "option_table.h" diff --git a/src/include/console/console.h b/src/include/console/console.h index 6fa624c..dfeedda 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -24,22 +24,6 @@ #include <console/loglevel.h> #include <console/post_codes.h> -#if CONFIG_CONSOLE_SERIAL -#include <uart.h> -#endif -#if CONFIG_USBDEBUG && !defined(__ROMCC__) -#include <console/usb.h> -#endif -#if CONFIG_CONSOLE_NE2K -#include <console/ne2k.h> -#endif -#if CONFIG_CONSOLE_CBMEM -#include <console/cbmem_console.h> -#endif -#if CONFIG_SPKMODEM -#include <console/spkmodem.h> -#endif - #ifndef __PRE_RAM__ unsigned char console_rx_byte(void); int console_tst_byte(void); diff --git a/src/include/uart.h b/src/include/console/uart.h index 997fe18..9b52a78 100644 --- a/src/include/uart.h +++ b/src/include/console/uart.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef UART_H -#define UART_H +#ifndef CONSOLE_UART_H +#define CONSOLE_UART_H /* Return the clock frequency UART uses as reference clock for * baudrate generator. */ @@ -44,4 +44,6 @@ void uart_init(void); uint32_t uartmem_getbaseaddr(void); -#endif /* UART_H */ +void oxford_init(void); + +#endif /* CONSOLE_UART_H */ diff --git a/src/include/uart8250.h b/src/include/uart8250.h index 112cd44..af95796 100644 --- a/src/include/uart8250.h +++ b/src/include/uart8250.h @@ -129,8 +129,6 @@ u32 uart_mem_init(void); #if defined(__PRE_RAM__) && CONFIG_DRIVERS_OXFORD_OXPCIE /* and special init for OXPCIe based cards */ extern int oxford_oxpcie_present; - -void oxford_init(void); #endif #endif diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index 33fa721..34168e3 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -23,6 +23,7 @@ #include <bootstate.h> #include <cbmem.h> #include <console/console.h> +#include <console/cbmem_console.h> #include <arch/early_variables.h> #if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__) #include <arch/acpi.h> diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c index 83d44e3..9d5419a 100644 --- a/src/lib/cbmem_console.c +++ b/src/lib/cbmem_console.c @@ -18,6 +18,7 @@ */ #include <console/console.h> +#include <console/cbmem_console.h> #include <cbmem.h> #include <arch/early_variables.h> #include <string.h> diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index 667c685..4d39219 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -21,6 +21,7 @@ */ #include <console/console.h> +#include <console/uart.h> #include <ip_checksum.h> #include <boot/coreboot_tables.h> #include <string.h> diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index d136eb8..3171e00 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -19,7 +19,7 @@ */ #include <arch/io.h> -#include <uart.h> +#include <console/uart.h> #include <uart8250.h> #include <trace.h> diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c index 5e96825..f35da05 100644 --- a/src/lib/uart8250mem.c +++ b/src/lib/uart8250mem.c @@ -19,7 +19,7 @@ */ #include <arch/io.h> -#include <uart.h> +#include <console/uart.h> #include <uart8250.h> #include <device/device.h> #include <delay.h> diff --git a/src/mainboard/cubietech/cubieboard/bootblock.c b/src/mainboard/cubietech/cubieboard/bootblock.c index 2e5929c..e22c1d8 100644 --- a/src/mainboard/cubietech/cubieboard/bootblock.c +++ b/src/mainboard/cubietech/cubieboard/bootblock.c @@ -7,7 +7,7 @@ */ #include <arch/io.h> -#include <uart.h> +#include <console/uart.h> #include <console/console.h> #include <delay.h> #include <cpu/allwinner/a10/gpio.h> diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c index dd46040..9e0a62e 100644 --- a/src/mainboard/ti/beaglebone/bootblock.c +++ b/src/mainboard/ti/beaglebone/bootblock.c @@ -19,7 +19,7 @@ #include <arch/io.h> #include <types.h> -#include <uart.h> +#include <console/uart.h> #include <console/console.h> #include <cpu/ti/am335x/pinmux.h> diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c index b9c3839..bfb4033 100644 --- a/src/northbridge/intel/sandybridge/raminit.c +++ b/src/northbridge/intel/sandybridge/raminit.c @@ -18,6 +18,7 @@ */ #include <console/console.h> +#include <console/usb.h> #include <string.h> #include <arch/hlt.h> #include <arch/io.h> |