diff options
Diffstat (limited to 'resources/coreboot/x60')
| -rw-r--r-- | resources/coreboot/x60/config/libgfxinit_corebootfb | 26 | ||||
| -rw-r--r-- | resources/coreboot/x60/config/libgfxinit_txtmode | 26 |
2 files changed, 4 insertions, 48 deletions
diff --git a/resources/coreboot/x60/config/libgfxinit_corebootfb b/resources/coreboot/x60/config/libgfxinit_corebootfb index 357daf49..7045581f 100644 --- a/resources/coreboot/x60/config/libgfxinit_corebootfb +++ b/resources/coreboot/x60/config/libgfxinit_corebootfb @@ -123,7 +123,6 @@ CONFIG_OVERRIDE_DEVICETREE="" CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout" CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 -CONFIG_UART_FOR_CONSOLE=0 # CONFIG_CONSOLE_POST is not set CONFIG_POST_DEVICE=y CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" @@ -139,7 +138,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CONSOLE_SERIAL=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60" # CONFIG_BOARD_LENOVO_G505S is not set # CONFIG_BOARD_LENOVO_L520 is not set @@ -183,7 +181,7 @@ CONFIG_THINKPADEC_HKEY_EISAID="IBM0068" CONFIG_DRIVER_LENOVO_SERIALS=y # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set -CONFIG_DRIVERS_UART_8250IO=y +# CONFIG_DRIVERS_UART_8250IO is not set CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_HEAP_SIZE=0x4000 CONFIG_BOARD_ROMSIZE_KB_2048=y @@ -242,8 +240,6 @@ CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 CONFIG_AZALIA_MAX_CODECS=3 # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set -CONFIG_TTYS0_BASE=0x3f8 -CONFIG_TTYS0_LCS=3 CONFIG_UART_PCI_ADDR=0x0 CONFIG_INTEL_HAS_TOP_SWAP=y # CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set @@ -422,7 +418,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_DRIVERS_UART=y # CONFIG_DRIVERS_UART_OXPCIE is not set CONFIG_HAVE_USBDEBUG=y # CONFIG_USBDEBUG is not set @@ -486,26 +481,10 @@ CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y CONFIG_BOOTBLOCK_CONSOLE=y CONFIG_POSTCAR_CONSOLE=y CONFIG_SQUELCH_EARLY_SMP=y - -# -# I/O mapped, 8250-compatible -# - -# -# Serial port base address = 0x3f8 -# -# 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_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_DUMP_TO_UART is not set # CONFIG_CONSOLE_SPI_FLASH is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -588,7 +567,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # General Debug Settings # -# 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/coreboot/x60/config/libgfxinit_txtmode b/resources/coreboot/x60/config/libgfxinit_txtmode index 74bf6e73..4e7d68a6 100644 --- a/resources/coreboot/x60/config/libgfxinit_txtmode +++ b/resources/coreboot/x60/config/libgfxinit_txtmode @@ -123,7 +123,6 @@ CONFIG_OVERRIDE_DEVICETREE="" CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout" CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 -CONFIG_UART_FOR_CONSOLE=0 # CONFIG_CONSOLE_POST is not set CONFIG_POST_DEVICE=y CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" @@ -139,7 +138,6 @@ CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DRIVERS_INTEL_WIFI=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000 -CONFIG_CONSOLE_SERIAL=y CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60" # CONFIG_BOARD_LENOVO_G505S is not set # CONFIG_BOARD_LENOVO_L520 is not set @@ -183,7 +181,7 @@ CONFIG_THINKPADEC_HKEY_EISAID="IBM0068" CONFIG_DRIVER_LENOVO_SERIALS=y # CONFIG_PCIEXP_L1_SUB_STATE is not set # CONFIG_PCIEXP_CLK_PM is not set -CONFIG_DRIVERS_UART_8250IO=y +# CONFIG_DRIVERS_UART_8250IO is not set CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_HEAP_SIZE=0x4000 CONFIG_BOARD_ROMSIZE_KB_2048=y @@ -242,8 +240,6 @@ CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000 CONFIG_AZALIA_MAX_CODECS=3 # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_COMMON_CLOCK is not set -CONFIG_TTYS0_BASE=0x3f8 -CONFIG_TTYS0_LCS=3 CONFIG_UART_PCI_ADDR=0x0 CONFIG_INTEL_HAS_TOP_SWAP=y # CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set @@ -420,7 +416,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_DRIVERS_UART=y # CONFIG_DRIVERS_UART_OXPCIE is not set CONFIG_HAVE_USBDEBUG=y # CONFIG_USBDEBUG is not set @@ -484,26 +479,10 @@ CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y CONFIG_BOOTBLOCK_CONSOLE=y CONFIG_POSTCAR_CONSOLE=y CONFIG_SQUELCH_EARLY_SMP=y - -# -# I/O mapped, 8250-compatible -# - -# -# Serial port base address = 0x3f8 -# -# 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_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_DUMP_TO_UART is not set # CONFIG_CONSOLE_SPI_FLASH is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set @@ -586,7 +565,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y # # General Debug Settings # -# CONFIG_GDB_STUB is not set # CONFIG_FATAL_ASSERTS is not set # CONFIG_DEBUG_CBFS is not set CONFIG_HAVE_DEBUG_RAM_SETUP=y |