Disable EHCI debug for the release (not needed in the release)

17 files changed, 44 insertions, 154 deletions

diff --git a/resources/libreboot/config/grub/d510mo/config b/resources/libreboot/config/grub/d510mo/config
index 526b9acc..2da05bf7 100644
--- a/resources/libreboot/config/grub/d510mo/config
+++ b/resources/libreboot/config/grub/d510mo/config
@@ -129,7 +129,6 @@ CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x100000
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP2 is not set
@@ -154,7 +153,7 @@ CONFIG_BOARD_INTEL_D510MO=y
 # CONFIG_BOARD_INTEL_WTM2 is not set
 CONFIG_CPU_ADDR_BITS=32
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_UART_8250IO=y
@@ -411,12 +410,10 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -448,7 +445,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -528,7 +524,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/config b/resources/libreboot/config/grub/ga-g41m-es2l/config
index 05b0caef..a5cfd9f9 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/config
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/config
@@ -20,6 +20,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -138,15 +139,14 @@ CONFIG_BOARD_GIGABYTE_GA_G41M_ES2L=y
 # CONFIG_BOARD_GIGABYTE_MA785GM is not set
 # CONFIG_BOARD_GIGABYTE_MA785GMT is not set
 # CONFIG_BOARD_GIGABYTE_MA78GM is not set
-CONFIG_USBDEBUG_HCD_INDEX=0
+# 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
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -405,13 +405,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
@@ -465,7 +462,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -548,7 +544,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config
index 83788695..ec5f6ad1 100644
--- a/resources/libreboot/config/grub/macbook21/config
+++ b/resources/libreboot/config/grub/macbook21/config
@@ -135,11 +135,10 @@ CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_UART_8250IO=y
@@ -412,13 +411,10 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-CONFIG_USBDEBUG_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -450,7 +446,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -532,7 +527,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
diff --git a/resources/libreboot/config/grub/r400_16mb/config b/resources/libreboot/config/grub/r400_16mb/config
index fe6a34f6..dcc911f6 100644
--- a/resources/libreboot/config/grub/r400_16mb/config
+++ b/resources/libreboot/config/grub/r400_16mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_R400=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config
index 7ed69479..f1a2f412 100644
--- a/resources/libreboot/config/grub/r400_4mb/config
+++ b/resources/libreboot/config/grub/r400_4mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_R400=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config
index 60232fd4..100af178 100644
--- a/resources/libreboot/config/grub/r400_8mb/config
+++ b/resources/libreboot/config/grub/r400_8mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_R400=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/t400_16mb/config b/resources/libreboot/config/grub/t400_16mb/config
index 2ec886d2..806ae4fa 100644
--- a/resources/libreboot/config/grub/t400_16mb/config
+++ b/resources/libreboot/config/grub/t400_16mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T400=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config
index 97e4f6dc..f4e1dd94 100644
--- a/resources/libreboot/config/grub/t400_4mb/config
+++ b/resources/libreboot/config/grub/t400_4mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T400=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config
index 2dfe20d2..9a100c88 100644
--- a/resources/libreboot/config/grub/t400_8mb/config
+++ b/resources/libreboot/config/grub/t400_8mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T400=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/t500_16mb/config b/resources/libreboot/config/grub/t500_16mb/config
index d3acd308..66cc2938 100644
--- a/resources/libreboot/config/grub/t500_16mb/config
+++ b/resources/libreboot/config/grub/t500_16mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config
index 77266387..72cebd81 100644
--- a/resources/libreboot/config/grub/t500_4mb/config
+++ b/resources/libreboot/config/grub/t500_4mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config
index afe2c7f5..015d8991 100644
--- a/resources/libreboot/config/grub/t500_8mb/config
+++ b/resources/libreboot/config/grub/t500_8mb/config
@@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -274,7 +274,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -394,8 +394,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -411,13 +409,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -473,7 +468,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -557,7 +551,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config
index 48b6d5d8..498132a4 100644
--- a/resources/libreboot/config/grub/t60/config
+++ b/resources/libreboot/config/grub/t60/config
@@ -130,7 +130,6 @@ CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
@@ -150,7 +149,7 @@ CONFIG_BOARD_LENOVO_T60=y
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_POST is not set
@@ -429,13 +428,10 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-CONFIG_USBDEBUG_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -467,7 +463,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -548,7 +543,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
diff --git a/resources/libreboot/config/grub/x200_16mb/config b/resources/libreboot/config/grub/x200_16mb/config
index d0da998a..a8ce9588 100644
--- a/resources/libreboot/config/grub/x200_16mb/config
+++ b/resources/libreboot/config/grub/x200_16mb/config
@@ -148,7 +148,7 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -410,13 +410,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -454,7 +451,6 @@ CONFIG_MMCONF_SUPPORT=y
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
@@ -538,7 +534,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config
index 15ef7413..01e9041e 100644
--- a/resources/libreboot/config/grub/x200_4mb/config
+++ b/resources/libreboot/config/grub/x200_4mb/config
@@ -148,7 +148,7 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -410,13 +410,10 @@ 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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -454,7 +451,6 @@ CONFIG_MMCONF_SUPPORT=y
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
@@ -538,7 +534,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config
index bef9b513..94636c64 100644
--- a/resources/libreboot/config/grub/x200_8mb/config
+++ b/resources/libreboot/config/grub/x200_8mb/config
@@ -148,7 +148,7 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
@@ -410,13 +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_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -454,7 +447,6 @@ CONFIG_MMCONF_SUPPORT=y
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
@@ -538,7 +530,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index f70649c2..08bb89a5 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -131,7 +131,6 @@ CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
@@ -151,7 +150,7 @@ CONFIG_BOARD_LENOVO_X60=y
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_POST is not set
@@ -433,13 +432,10 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
-CONFIG_USBDEBUG_IN_ROMSTAGE=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=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_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_RTC=y
 # CONFIG_TPM is not set
@@ -471,7 +467,6 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -554,7 +549,6 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y