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 /src/include | |
| parent | 7e75f20477511c48f47416caed7301e852165a7f (diff) | |
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>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/console/console.h | 16 | ||||
| -rw-r--r-- | src/include/console/uart.h (renamed from src/include/uart.h) | 8 | ||||
| -rw-r--r-- | src/include/uart8250.h | 2 |
3 files changed, 5 insertions, 21 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h index 6fa624c799..dfeedda5e0 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 997fe185ce..9b52a78c69 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 112cd44945..af95796733 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 |