Disable serial port coreboot log output (not needed in release)

20 files changed, 72 insertions, 352 deletions

diff --git a/resources/libreboot/config/grub/d510mo/config b/resources/libreboot/config/grub/d510mo/config
index 2da05bf7..ebe6636b 100644
--- a/resources/libreboot/config/grub/d510mo/config
+++ b/resources/libreboot/config/grub/d510mo/config
@@ -123,13 +123,11 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Intel"
 CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x100000
 CONFIG_POST_DEVICE=y
-CONFIG_TTYS0_LCS=3
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP2 is not set
 # CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set
@@ -186,7 +184,6 @@ CONFIG_FMDFILE=""
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/pineview/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
@@ -401,7 +398,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -410,10 +407,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -426,28 +419,20 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -513,7 +498,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/config b/resources/libreboot/config/grub/ga-g41m-es2l/config
index a5cfd9f9..a0c7fc0c 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/config
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/config
@@ -115,7 +115,6 @@ CONFIG_MAINBOARD_VENDOR="GIGABYTE"
 CONFIG_MAX_CPUS=1
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x100000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2e32"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -140,7 +139,6 @@ CONFIG_BOARD_GIGABYTE_GA_G41M_ES2L=y
 # CONFIG_BOARD_GIGABYTE_MA785GMT is not set
 # CONFIG_BOARD_GIGABYTE_MA78GM is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_CPU_ADDR_BITS=36
@@ -182,7 +180,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/x4x/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -393,7 +390,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_REALTEK_8168_RESET=y
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -405,10 +402,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
@@ -443,27 +436,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -533,7 +518,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/grub/kcma-d8/config
index 9b1d0627..ec7c745b 100644
--- a/resources/libreboot/config/grub/kcma-d8/config
+++ b/resources/libreboot/config/grub/kcma-d8/config
@@ -160,14 +160,12 @@ CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kcma-d8/bootblock.c"
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_MAX_REBOOT_CNT=10
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x400000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 # CONFIG_POST_DEVICE is not set
 CONFIG_BOOT_MEDIA_SPI_BUS=0
-CONFIG_TTYS0_LCS=3
 CONFIG_CONSOLE_POST=y
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
@@ -208,7 +206,6 @@ CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0xc0000
 CONFIG_CONSOLE_CBMEM=y
@@ -456,7 +453,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -499,27 +496,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -588,7 +577,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/grub/kgpe-d16/config
index 2f2a7b98..3a847cbc 100644
--- a/resources/libreboot/config/grub/kgpe-d16/config
+++ b/resources/libreboot/config/grub/kgpe-d16/config
@@ -160,14 +160,12 @@ CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kgpe-d16/bootblock.c"
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_MAX_REBOOT_CNT=10
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x400000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 # CONFIG_POST_DEVICE is not set
 CONFIG_BOOT_MEDIA_SPI_BUS=0
-CONFIG_TTYS0_LCS=3
 CONFIG_CONSOLE_POST=y
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
@@ -208,7 +206,6 @@ CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0xc0000
 CONFIG_CONSOLE_CBMEM=y
@@ -456,7 +453,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -499,27 +496,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -588,7 +577,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config
index ec5f6ad1..84db8770 100644
--- a/resources/libreboot/config/grub/macbook21/config
+++ b/resources/libreboot/config/grub/macbook21/config
@@ -129,13 +129,11 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
 CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
-CONFIG_TTYS0_LCS=3
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -172,7 +170,6 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
@@ -402,7 +399,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -411,10 +408,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -427,28 +420,20 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -516,7 +501,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
index 9e1e4030..cdef35a8 100644
--- a/resources/libreboot/config/grub/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
@@ -125,7 +125,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
 CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
@@ -138,7 +137,6 @@ CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_DEVICE=y
-CONFIG_TTYS0_LCS=3
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="1.0"
@@ -172,7 +170,6 @@ CONFIG_FMDFILE=""
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82371eb/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
 # CONFIG_SOC_MARVELL_BG4CD is not set
@@ -379,7 +376,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -400,28 +397,20 @@ CONFIG_STACK_SIZE=0x1000
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -488,7 +477,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set
diff --git a/resources/libreboot/config/grub/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config
index 1012c539..6896e432 100644
--- a/resources/libreboot/config/grub/qemu_q35_ich9/config
+++ b/resources/libreboot/config/grub/qemu_q35_ich9/config
@@ -124,7 +124,6 @@ CONFIG_POST_IO=y
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 # CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
@@ -137,7 +136,6 @@ CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_DEVICE=y
-CONFIG_TTYS0_LCS=3
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -172,7 +170,6 @@ CONFIG_FMDFILE=""
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
@@ -381,7 +378,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -402,28 +399,20 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -489,7 +478,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set
diff --git a/resources/libreboot/config/grub/r400_16mb/config b/resources/libreboot/config/grub/r400_16mb/config
index dcc911f6..99ba52bf 100644
--- a/resources/libreboot/config/grub/r400_16mb/config
+++ b/resources/libreboot/config/grub/r400_16mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0xFFD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config
index f1a2f412..14462e59 100644
--- a/resources/libreboot/config/grub/r400_4mb/config
+++ b/resources/libreboot/config/grub/r400_4mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config
index 100af178..cc9561ea 100644
--- a/resources/libreboot/config/grub/r400_8mb/config
+++ b/resources/libreboot/config/grub/r400_8mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/t400_16mb/config b/resources/libreboot/config/grub/t400_16mb/config
index 806ae4fa..30e4cc15 100644
--- a/resources/libreboot/config/grub/t400_16mb/config
+++ b/resources/libreboot/config/grub/t400_16mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0xFFD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config
index f4e1dd94..0517f1e7 100644
--- a/resources/libreboot/config/grub/t400_4mb/config
+++ b/resources/libreboot/config/grub/t400_4mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config
index 9a100c88..be9f61cf 100644
--- a/resources/libreboot/config/grub/t400_8mb/config
+++ b/resources/libreboot/config/grub/t400_8mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/t500_16mb/config b/resources/libreboot/config/grub/t500_16mb/config
index 66cc2938..c7227761 100644
--- a/resources/libreboot/config/grub/t500_16mb/config
+++ b/resources/libreboot/config/grub/t500_16mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0xFFD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config
index 72cebd81..1a09b085 100644
--- a/resources/libreboot/config/grub/t500_4mb/config
+++ b/resources/libreboot/config/grub/t500_4mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config
index 015d8991..b24f8e5b 100644
--- a/resources/libreboot/config/grub/t500_8mb/config
+++ b/resources/libreboot/config/grub/t500_8mb/config
@@ -116,7 +116,6 @@ CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
@@ -129,7 +128,6 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -187,7 +185,6 @@ CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
@@ -397,7 +394,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -409,10 +406,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -449,27 +442,19 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -540,7 +525,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config
index 498132a4..31ca0d51 100644
--- a/resources/libreboot/config/grub/t60/config
+++ b/resources/libreboot/config/grub/t60/config
@@ -124,13 +124,11 @@ CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
-CONFIG_TTYS0_LCS=3
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
@@ -182,7 +180,6 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
@@ -419,7 +416,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -428,10 +425,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -444,28 +437,20 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -532,7 +517,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
diff --git a/resources/libreboot/config/grub/x200_16mb/config b/resources/libreboot/config/grub/x200_16mb/config
index a8ce9588..b50d32b1 100644
--- a/resources/libreboot/config/grub/x200_16mb/config
+++ b/resources/libreboot/config/grub/x200_16mb/config
@@ -410,10 +410,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config
index 01e9041e..38812ee7 100644
--- a/resources/libreboot/config/grub/x200_4mb/config
+++ b/resources/libreboot/config/grub/x200_4mb/config
@@ -410,10 +410,6 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index 08bb89a5..76c2f6c8 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -125,13 +125,11 @@ CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
-CONFIG_TTYS0_LCS=3
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
@@ -183,7 +181,6 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
@@ -423,7 +420,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -432,10 +429,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-# CONFIG_USBDEBUG_DONGLE_STD is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -448,28 +441,20 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-
-#
-# Serial port base address = 0x3f8
-#
+# CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_115200 is not set
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -537,7 +522,6 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # Debugging
 #
-# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 CONFIG_HAVE_DEBUG_RAM_SETUP=y