coreboot configs: unify turning CONFIG_USBDEBUG off

sed -i '$a CONFIG_USBDEBUG=n' config/coreboot-*.config grep -R CONFIG_COREBOOT_VERSION boards/ | awk -F "/" {'print $2'} | while read board; do if ! sudo make BOARD=$board coreboot.save_in_oldconfig_format_in_place > /dev/null 2>&1; then echo $board failed;fi; done Note: Boards that are unmaintained accumulates settings addition per the sed call. Why deactivate: - Well, this is equivalent of cbmem -c which gives way too much information from attacker. TODO: add an helper later on so that builds aimed at testing coreboot version bump pass to release mode or something. As of this commit, we accept that bricks might happen and that troubleshooting will be made in a case basis?! Signed-off-by: Thierry Laurion <[email protected]>
linuxboot · Jul 19, 2024 · fac3452 · fac3452
1 parent 837723b
commit fac3452
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 164 deletions.
diff --git a/config/coreboot-kgpe-d16_server-whiptail.config b/config/coreboot-kgpe-d16_server-whiptail.config
@@ -143,7 +143,6 @@ CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAX_REBOOT_CNT=10
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
@@ -160,7 +159,7 @@ CONFIG_TPM_PIRQ=0x0
 CONFIG_TTYS0_LCS=3
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
@@ -484,12 +483,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
@@ -597,7 +590,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

diff --git a/config/coreboot-kgpe-d16_server.config b/config/coreboot-kgpe-d16_server.config
@@ -143,7 +143,6 @@ CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAX_REBOOT_CNT=10
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
@@ -160,7 +159,7 @@ CONFIG_TPM_PIRQ=0x0
 CONFIG_TTYS0_LCS=3
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
@@ -484,12 +483,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
@@ -597,7 +590,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

diff --git a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config
@@ -143,7 +143,6 @@ CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAX_REBOOT_CNT=10
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
@@ -160,7 +159,7 @@ CONFIG_TPM_PIRQ=0x0
 CONFIG_TTYS0_LCS=3
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
@@ -484,12 +483,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
@@ -597,7 +590,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

diff --git a/config/coreboot-kgpe-d16_workstation.config b/config/coreboot-kgpe-d16_workstation.config
@@ -143,7 +143,6 @@ CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAX_REBOOT_CNT=10
-CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
@@ -160,7 +159,7 @@ CONFIG_TPM_PIRQ=0x0
 CONFIG_TTYS0_LCS=3
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-CONFIG_USBDEBUG=y
+# CONFIG_USBDEBUG is not set
 CONFIG_IPMI_KCS_REGISTER_SPACING=1
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
@@ -484,12 +483,6 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
@@ -597,7 +590,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

diff --git a/config/coreboot-p8z77-m_pro-tpm1.config b/config/coreboot-p8z77-m_pro-tpm1.config
@@ -702,3 +702,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-qemu-fbwhiptail-tpm1-hotp.config b/config/coreboot-qemu-fbwhiptail-tpm1-hotp.config
@@ -18,3 +18,4 @@ CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="@BOARD_BUILD_DIR@/bzImage"
 CONFIG_LINUX_INITRD="@BOARD_BUILD_DIR@/initrd.cpio.xz"
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-qemu-tpm1.config b/config/coreboot-qemu-tpm1.config
@@ -133,7 +133,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
-CONFIG_USBDEBUG_HCD_INDEX=0
 # CONFIG_CONSOLE_POST is not set
 CONFIG_TPM_PIRQ=0x0
 # CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
@@ -363,14 +362,7 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-# CONFIG_USBDEBUG_DONGLE_WCH_CH347 is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=1024
@@ -460,7 +452,6 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set

diff --git a/config/coreboot-qemu-tpm2.config b/config/coreboot-qemu-tpm2.config
@@ -133,7 +133,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
-CONFIG_USBDEBUG_HCD_INDEX=0
 # CONFIG_CONSOLE_POST is not set
 CONFIG_TPM_PIRQ=0x0
 # CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
@@ -357,14 +356,7 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-# CONFIG_USBDEBUG_DONGLE_WCH_CH347 is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=1024
@@ -453,7 +445,6 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set

diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config
@@ -478,14 +478,7 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-# CONFIG_USBDEBUG_DONGLE_WCH_CH347 is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
@@ -592,7 +585,6 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set

diff --git a/config/coreboot-t420.config b/config/coreboot-t420.config
@@ -696,3 +696,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-t430-legacy-flash.config b/config/coreboot-t430-legacy-flash.config
@@ -663,3 +663,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-t430-legacy.config b/config/coreboot-t430-legacy.config
@@ -682,3 +682,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config
@@ -478,14 +478,7 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-# CONFIG_USBDEBUG_DONGLE_WCH_CH347 is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
@@ -592,7 +585,6 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set

diff --git a/config/coreboot-t440p.config b/config/coreboot-t440p.config
@@ -474,14 +474,7 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-# CONFIG_USBDEBUG_DONGLE_WCH_CH347 is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
@@ -587,7 +580,6 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set

diff --git a/config/coreboot-t520-maximized.config b/config/coreboot-t520-maximized.config
@@ -692,3 +692,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-t530-dgpu-maximized.config b/config/coreboot-t530-dgpu-maximized.config
@@ -728,3 +728,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-t530-maximized.config b/config/coreboot-t530-maximized.config
@@ -481,14 +481,7 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-# CONFIG_USBDEBUG_DONGLE_WCH_CH347 is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
@@ -594,7 +587,6 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set

diff --git a/config/coreboot-w530-dgpu-K1000m-maximized.config b/config/coreboot-w530-dgpu-K1000m-maximized.config
@@ -729,3 +729,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-w530-dgpu-K2000m-maximized.config b/config/coreboot-w530-dgpu-K2000m-maximized.config
@@ -729,3 +729,4 @@ CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
 CONFIG_USBDEBUG=y
+CONFIG_USBDEBUG=n
diff --git a/config/coreboot-w530-maximized.config b/config/coreboot-w530-maximized.config
@@ -481,14 +481,7 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-CONFIG_USBDEBUG=y
-CONFIG_USBDEBUG_IN_PRE_RAM=y
-CONFIG_USBDEBUG_DEFAULT_PORT=0
-CONFIG_USBDEBUG_DONGLE_STD=y
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
-# CONFIG_USBDEBUG_DONGLE_WCH_CH347 is not set
-CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_USBDEBUG is not set
 # CONFIG_VPD is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
@@ -595,7 +588,6 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
-CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set