summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-27 19:30:18 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-04-18 16:39:19 +0200
commit4076072b6c76debae0e328486d9bab71fe391db7 (patch)
tree9c0ac4e1c9e65b15d6923cf3c41e4aaccf209b8b /src/include
parentfd95624dae22b00e00417dbfa1c0a4a4a40193c0 (diff)
downloadcoreboot-4076072b6c76debae0e328486d9bab71fe391db7.tar.xz
console: Use romstage code for ramstage and SMM
Console is arch-agnostic and there is no need for separate implementations for romstage and ramstage. For SMM there is console only if DEBUG_SMI is selected. Change-Id: I7028eeeff8bfbb9c8552972436b29a7508834d87 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5338 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/console/console.h6
-rw-r--r--src/include/console/streams.h25
2 files changed, 27 insertions, 4 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 0ebd1b70a9..54e454547c 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -26,10 +26,6 @@
#ifndef __ROMCC__
int console_log_level(int msg_level);
-void console_init(void);
-void console_hw_init(void);
-void console_tx_byte(unsigned char byte);
-void console_tx_flush(void);
void post_code(u8 value);
#if CONFIG_CMOS_POST_EXTRA
void post_log_extra(u32 value);
@@ -52,9 +48,11 @@ void __attribute__ ((noreturn)) die(const char *msg);
/* Do nothing. */
static inline void printk(int LEVEL, const char *fmt, ...) {}
static inline void do_putchar(unsigned char byte) {}
+static inline void console_init(void) {}
#else
+void console_init(void);
int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
void do_putchar(unsigned char byte);
diff --git a/src/include/console/streams.h b/src/include/console/streams.h
new file mode 100644
index 0000000000..288fade63e
--- /dev/null
+++ b/src/include/console/streams.h
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _CONSOLE_STREAMS_H_
+#define _CONSOLE_STREAMS_H_
+
+void console_hw_init(void);
+void console_tx_byte(unsigned char byte);
+void console_tx_flush(void);
+
+#endif /* _CONSOLE_STREAMS_H_ */