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:
parent
91050b7647
commit
f9cdb486d1
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -23,14 +23,9 @@
|
|||
#include <console/console.h>
|
||||
#include <console/uart.h>
|
||||
#include <console/streams.h>
|
||||
#include <device/pci.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. */
|
||||
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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue