diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-18 13:21:50 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-11-19 17:46:14 +0100 |
| commit | f9cdb486d182668e053ca16f115cbc49066d7768 (patch) | |
| tree | d5d5d1b4336263a1c5823525c71fa33b66b09e9c | |
| parent | 91050b7647dad4b89f2d21672cf3287584ea34bd (diff) | |
| download | coreboot-f9cdb486d182668e053ca16f115cbc49066d7768.tar.xz | |
console: Isolate console_init() for ROMCC
Change-Id: I623643834fb1c6af166a851fec7e31447944f0b6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7509
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
| -rw-r--r-- | src/arch/x86/lib/romcc_console.c | 17 | ||||
| -rw-r--r-- | src/console/init.c | 8 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c index 62490fcb9d..9e0c3c93fc 100644 --- a/src/arch/x86/lib/romcc_console.c +++ b/src/arch/x86/lib/romcc_console.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <build.h> #include <console/streams.h> #include <console/early_print.h> @@ -60,6 +61,20 @@ void console_tx_flush(void) } #include <console/early_print.c> -#include <console/init.c> #include <console/post.c> #include <console/die.c> + +void console_init(void) +{ + static const char console_test[] = + "\n\ncoreboot-" + COREBOOT_VERSION + COREBOOT_EXTRA_VERSION + " " + COREBOOT_BUILD + " starting...\n"; + + console_hw_init(); + + print_info(console_test); +} diff --git a/src/console/init.c b/src/console/init.c index 8bdb2cc054..6d3dc1f68a 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -23,14 +23,9 @@ #include <console/console.h> #include <console/uart.h> #include <console/streams.h> -#include <option.h> - -#if CONFIG_EARLY_PCI_BRIDGE -/* FIXME: ROMCC chokes on PCI headers. */ #include <device/pci.h> -#endif +#include <option.h> -#if !defined(__ROMCC__) /* While in romstage, console loglevel is built-time constant. */ static ROMSTAGE_CONST int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; @@ -38,7 +33,6 @@ int console_log_level(int msg_level) { return (console_loglevel >= msg_level); } -#endif void console_init(void) { |