>From b3202579c3798bb1c93c4ec453f7645e7bee82f6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 17 Mar 2016 17:42:09 -0500 Subject: [PATCH 2/2] mb/kcma-d8,kgpe-d16: Disable USB debug support This resolves a long standing issue with Libreboot manifesting as extremely slow boot and GRUB failure. Also clean up other debug-related options. --- resources/libreboot/config/seabios/kcma-d8/config | 22 +++++++++------------- resources/libreboot/config/seabios/kgpe-d16/config | 22 +++++++++------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/resources/libreboot/config/seabios/kcma-d8/config b/resources/libreboot/config/seabios/kcma-d8/config index 2624373..61cd50d 100644 --- a/resources/libreboot/config/seabios/kcma-d8/config +++ b/resources/libreboot/config/seabios/kcma-d8/config @@ -153,7 +153,7 @@ CONFIG_BOARD_ASUS_KCMA_D8=y # CONFIG_BOARD_ASUS_P2B_LS is not set # CONFIG_BOARD_ASUS_P2B is not set # CONFIG_BOARD_ASUS_P3B_F is not set -CONFIG_POST_IO=y +# CONFIG_POST_IO is not set CONFIG_AGP_APERTURE_SIZE=0x4000000 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kcma-d8/bootblock.c" CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f @@ -164,16 +164,16 @@ CONFIG_ID_SECTION_OFFSET=0x80 CONFIG_RAMTOP=0x400000 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 -CONFIG_POST_DEVICE=y +# CONFIG_POST_DEVICE is not set CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_BOOT_MEDIA_SPI_BUS=0 CONFIG_TTYS0_LCS=3 CONFIG_UDELAY_LAPIC_FIXED_FSB=200 CONFIG_CPU_ADDR_BITS=48 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_PS2_KEYBOARD=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_2048=y @@ -482,11 +482,11 @@ CONFIG_DRIVERS_UART=y # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set -CONFIG_HAVE_USBDEBUG=y -CONFIG_HAVE_USBDEBUG_OPTIONS=y -CONFIG_USBDEBUG_IN_ROMSTAGE=y +CONFIG_HAVE_USBDEBUG=n +CONFIG_HAVE_USBDEBUG_OPTIONS=n +CONFIG_USBDEBUG_IN_ROMSTAGE=n 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 @@ -536,11 +536,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set # CONFIG_CMOS_POST is not set -# CONFIG_CONSOLE_POST is not set -CONFIG_POST_DEVICE_NONE=y -# CONFIG_POST_DEVICE_LPC is not set -# CONFIG_POST_DEVICE_PCI_PCIE is not set -CONFIG_POST_IO_PORT=0x80 +CONFIG_CONSOLE_POST=y # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y diff --git a/resources/libreboot/config/seabios/kgpe-d16/config b/resources/libreboot/config/seabios/kgpe-d16/config index d0c2347..ea8006c 100644 --- a/resources/libreboot/config/seabios/kgpe-d16/config +++ b/resources/libreboot/config/seabios/kgpe-d16/config @@ -153,7 +153,7 @@ CONFIG_BOARD_ASUS_KGPE_D16=y # CONFIG_BOARD_ASUS_P2B_LS is not set # CONFIG_BOARD_ASUS_P2B is not set # CONFIG_BOARD_ASUS_P3B_F is not set -CONFIG_POST_IO=y +# CONFIG_POST_IO is not set CONFIG_AGP_APERTURE_SIZE=0x4000000 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kgpe-d16/bootblock.c" CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f @@ -164,16 +164,16 @@ CONFIG_ID_SECTION_OFFSET=0x80 CONFIG_RAMTOP=0x400000 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 -CONFIG_POST_DEVICE=y +# CONFIG_POST_DEVICE is not set CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_BOOT_MEDIA_SPI_BUS=0 CONFIG_TTYS0_LCS=3 CONFIG_UDELAY_LAPIC_FIXED_FSB=200 CONFIG_CPU_ADDR_BITS=48 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_PS2_KEYBOARD=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_2048=y @@ -482,11 +482,11 @@ CONFIG_DRIVERS_UART=y # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set -CONFIG_HAVE_USBDEBUG=y -CONFIG_HAVE_USBDEBUG_OPTIONS=y -CONFIG_USBDEBUG_IN_ROMSTAGE=y +CONFIG_HAVE_USBDEBUG=n +CONFIG_HAVE_USBDEBUG_OPTIONS=n +CONFIG_USBDEBUG_IN_ROMSTAGE=n 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 @@ -536,11 +536,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set # CONFIG_CMOS_POST is not set -# CONFIG_CONSOLE_POST is not set -CONFIG_POST_DEVICE_NONE=y -# CONFIG_POST_DEVICE_LPC is not set -# CONFIG_POST_DEVICE_PCI_PCIE is not set -CONFIG_POST_IO_PORT=0x80 +CONFIG_CONSOLE_POST=y # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set CONFIG_HAVE_ACPI_RESUME=y CONFIG_RESUME_PATH_SAME_AS_BOOT=y -- 2.1.4