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 #include #include @@ -60,6 +61,20 @@ void console_tx_flush(void) } #include -#include #include #include + +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 #include #include +#include #include -#if CONFIG_EARLY_PCI_BRIDGE -/* FIXME: ROMCC chokes on PCI headers. */ -#include -#endif - -#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) {