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

CBMEM CONSOLE: Add code using the new console driver. 

The new added code is compiled in when the CBMEM_CONSOLE config
flag is enabled.

Change-Id: Ifd1f492ce6321412a014333babbc5b3f14635988
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://review.coreboot.org/721
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Vadim Bendebury 2011-09-30 11:16:49 -07:00 committed by Stefan Reinauer
parent be25a4ded0
commit 1078c67af1
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,9 @@ static void __console_tx_byte(unsigned char byte)
#if CONFIG_CONSOLE_NE2K #if CONFIG_CONSOLE_NE2K
ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT); ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
#endif #endif
#if CONFIG_CONSOLE_CBMEM
cbmemc_tx_byte(byte);
#endif
} }
static void __console_tx_nibble(unsigned nibble) static void __console_tx_nibble(unsigned nibble)

3
src/arch/x86/lib/romstage_console.c
View File

@ -46,6 +46,9 @@ static void console_tx_byte(unsigned char byte)
#if CONFIG_CONSOLE_NE2K #if CONFIG_CONSOLE_NE2K
ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT); ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT);
#endif #endif
#if CONFIG_CONSOLE_CBMEM
cbmemc_tx_byte(byte);
#endif
} }
static void console_tx_flush(void) static void console_tx_flush(void)

3
src/boot/hardwaremain.c
View File

@ -92,6 +92,9 @@ void hardwaremain(int boot_complete)
#if CONFIG_WRITE_HIGH_TABLES == 1 #if CONFIG_WRITE_HIGH_TABLES == 1
cbmem_initialize(); cbmem_initialize();
#if CONFIG_CONSOLE_CBMEM
cbmemc_reinit();
#endif
#endif #endif
#if CONFIG_HAVE_ACPI_RESUME == 1 #if CONFIG_HAVE_ACPI_RESUME == 1
suspend_resume(); suspend_resume();

5
src/console/console.c
View File

@ -87,7 +87,7 @@ int console_tst_byte(void)
return 0; return 0;
} }
#else #else // __PRE_RAM__ ^^^ NOT defined vvv defined
void console_init(void) void console_init(void)
{ {
@ -103,6 +103,9 @@ void console_init(void)
#endif #endif
#if CONFIG_CONSOLE_NE2K #if CONFIG_CONSOLE_NE2K
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT); ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
#endif
#if CONFIG_CONSOLE_CBMEM
cbmemc_init();
#endif #endif
static const char console_test[] = static const char console_test[] =
"\n\ncoreboot-" "\n\ncoreboot-"