GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2014-11-18 13:21:50 +02:00 committed by Patrick Georgi
parent 91050b7647
commit f9cdb486d1
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/arch/x86/lib/romcc_console.c
View File

@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <build.h>
#include <console/streams.h> #include <console/streams.h>
#include <console/early_print.h> #include <console/early_print.h>
@ -60,6 +61,20 @@ void console_tx_flush(void)
} }
#include <console/early_print.c> #include <console/early_print.c>
#include <console/init.c>
#include <console/post.c> #include <console/post.c>
#include <console/die.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);
}

8
src/console/init.c
View File

@ -23,14 +23,9 @@
#include <console/console.h> #include <console/console.h>
#include <console/uart.h> #include <console/uart.h>
#include <console/streams.h> #include <console/streams.h>
#include <device/pci.h>
#include <option.h> #include <option.h>
#if CONFIG_EARLY_PCI_BRIDGE
/* FIXME: ROMCC chokes on PCI headers. */
#include <device/pci.h>
#endif
#if !defined(__ROMCC__)
/* While in romstage, console loglevel is built-time constant. */ /* While in romstage, console loglevel is built-time constant. */
static ROMSTAGE_CONST int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; 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); return (console_loglevel >= msg_level);
} }
#endif
void console_init(void) void console_init(void)
{ {