[coreboot-gerrit] New patch to review for coreboot: f4fc2f9 console: Isolate console_init() for ROMCC
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Tue Nov 18 12:43:21 CET 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7509
-gerrit
commit f4fc2f90d4b8ca491ee54c83edfde86fc71ea393
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Tue Nov 18 13:21:50 2014 +0200
console: Isolate console_init() for ROMCC
Change-Id: I623643834fb1c6af166a851fec7e31447944f0b6
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/arch/x86/lib/romcc_console.c | 17 ++++++++++++++++-
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 62490fc..9e0c3c9 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 8bdb2cc..6d3dc1f 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)
{
More information about the coreboot-gerrit
mailing list