summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/libpayload/include/coreboot_tables.h2
-rw-r--r--src/console/Kconfig4
-rw-r--r--src/console/Makefile.inc1
-rw-r--r--src/console/logbuf_console.c21
-rw-r--r--src/include/boot/coreboot_tables.h2
-rw-r--r--src/lib/coreboot_table.c6
6 files changed, 4 insertions, 32 deletions
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index 375d33b63a..26838e8dc3 100644
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -133,7 +133,7 @@ struct cb_console {
#define CB_TAG_CONSOLE_SERIAL8250 0
#define CB_TAG_CONSOLE_VGA 1 // OBSOLETE
#define CB_TAG_CONSOLE_BTEXT 2 // OBSOLETE
-#define CB_TAG_CONSOLE_LOGBUF 3
+#define CB_TAG_CONSOLE_LOGBUF 3 // OBSOLETE
#define CB_TAG_CONSOLE_SROM 4 // OBSOLETE
#define CB_TAG_CONSOLE_EHCI 5
diff --git a/src/console/Kconfig b/src/console/Kconfig
index c23f862326..12b942df2c 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -377,10 +377,6 @@ config DEFAULT_CONSOLE_LOGLEVEL
help
Map the log level config names to an integer.
-config CONSOLE_LOGBUF
- bool
- default n
-
config NO_POST
bool "Don't show any POST codes"
default n
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 9edec3ccff..62be1d2b23 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -22,7 +22,6 @@ ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
ramstage-$(CONFIG_SPKMODEM) += spkmodem_console.c
ramstage-$(CONFIG_USBDEBUG) += usbdebug_console.c
-ramstage-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c
ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
ramstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon_console.c
diff --git a/src/console/logbuf_console.c b/src/console/logbuf_console.c
deleted file mode 100644
index a76791d542..0000000000
--- a/src/console/logbuf_console.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <console/console.h>
-
-#define LOGBUF_SIZE 1024
-
-// KEEP THIS GLOBAL.
-// I need the address so I can watch it with the ARIUM hardware. RGM.
-char logbuf[LOGBUF_SIZE];
-int logbuf_offset = 0;
-
-static void logbuf_tx_byte(unsigned char byte)
-{
- logbuf[logbuf_offset] = byte;
- logbuf_offset = (logbuf_offset +1) % LOGBUF_SIZE;
-}
-
-static const struct console_driver __console = {
- .init = 0,
- .tx_byte = logbuf_tx_byte,
- .rx_byte = 0,
- .tst_byte = 0,
-};}
diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h
index 87819ce4dc..aa8409afd4 100644
--- a/src/include/boot/coreboot_tables.h
+++ b/src/include/boot/coreboot_tables.h
@@ -163,7 +163,7 @@ struct lb_console {
#define LB_TAG_CONSOLE_SERIAL8250 0
#define LB_TAG_CONSOLE_VGA 1 // OBSOLETE
#define LB_TAG_CONSOLE_BTEXT 2 // OBSOLETE
-#define LB_TAG_CONSOLE_LOGBUF 3
+#define LB_TAG_CONSOLE_LOGBUF 3 // OBSOLETE
#define LB_TAG_CONSOLE_SROM 4 // OBSOLETE
#define LB_TAG_CONSOLE_EHCI 5
#define LB_TAG_CONSOLE_SERIAL8250MEM 6
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index a0a806d7fc..772729adf5 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -137,7 +137,8 @@ static struct lb_serial *lb_serial(struct lb_header *header)
#endif
}
-#if CONFIG_CONSOLE_SERIAL || CONFIG_CONSOLE_LOGBUF || CONFIG_USBDEBUG
+#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM || \
+ CONFIG_CONSOLE_SERIAL_UART || CONFIG_USBDEBUG
static void add_console(struct lb_header *header, u16 consoletype)
{
struct lb_console *console;
@@ -157,9 +158,6 @@ static void lb_console(struct lb_header *header)
#if CONFIG_CONSOLE_SERIAL8250MEM || CONFIG_CONSOLE_SERIAL_UART
add_console(header, LB_TAG_CONSOLE_SERIAL8250MEM);
#endif
-#if CONFIG_CONSOLE_LOGBUF
- add_console(header, LB_TAG_CONSOLE_LOGBUF);
-#endif
#if CONFIG_USBDEBUG
add_console(header, LB_TAG_CONSOLE_EHCI);
#endif