From d4bee5d0fb8b8775af2a0da356fce9d3bf8104bb Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Mon, 4 May 2015 14:58:54 +0100 Subject: Update coreboot + merge GM45 hybrid GPU patches Also add power_on_after_fail to X200 and others (prevents the bug where the system would boot when connecting the AC adapter) (option in menuconfig to use CMOS/nvram settings is now enabled) Also NetDCDC is now the default USB debug dongle used (compatible with the BBB rev C). Add two new methods for managing coreboot configs: ./build config corebootreplace ./build config corebootmodify --- resources/libreboot/config/t400_4mb/config | 33 +++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'resources/libreboot/config/t400_4mb') diff --git a/resources/libreboot/config/t400_4mb/config b/resources/libreboot/config/t400_4mb/config index 678bea25..aa269c11 100644 --- a/resources/libreboot/config/t400_4mb/config +++ b/resources/libreboot/config/t400_4mb/config @@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y # CONFIG_ANY_TOOLCHAIN is not set # CONFIG_CCACHE is not set # CONFIG_SCONFIG_GENPARSER is not set -# CONFIG_USE_OPTION_TABLE is not set +CONFIG_USE_OPTION_TABLE=y +CONFIG_STATIC_OPTION_TABLE=y CONFIG_COMPRESS_RAMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_EARLY_CBMEM_INIT=y @@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y CONFIG_BOOTBLOCK_SIMPLE=y # CONFIG_BOOTBLOCK_NORMAL is not set CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" +# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set # CONFIG_UPDATE_IMAGE is not set # @@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_WINENT is not set # CONFIG_VENDOR_WYSE is not set CONFIG_BOARD_SPECIFIC_OPTIONS=y -CONFIG_MAINBOARD_DIR="lenovo/x200" +CONFIG_MAINBOARD_DIR="lenovo/t400" CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400" CONFIG_MAINBOARD_VENDOR="LENOVO" CONFIG_MAX_CPUS=2 @@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80 CONFIG_RAMTOP=0x200000 CONFIG_STACK_SIZE=0x1000 CONFIG_USBDEBUG_HCD_INDEX=2 +CONFIG_TTYS0_LCS=3 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x3FD000 CONFIG_POST_IO=y @@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y # CONFIG_ARCH_ARM is not set # CONFIG_ARCH_ARM64 is not set # CONFIG_ARCH_RISCV is not set +# CONFIG_ARCH_MIPS is not set CONFIG_ARCH_BOOTBLOCK_X86_32=y CONFIG_ARCH_VERSTAGE_X86_32=y CONFIG_ARCH_ROMSTAGE_X86_32=y @@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set -# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set -# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set # CONFIG_ARM_LPAE is not set # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set # CONFIG_ARCH_VERSTAGE_ARM64 is not set # CONFIG_ARCH_ROMSTAGE_ARM64 is not set # CONFIG_ARCH_RAMSTAGE_ARM64 is not set +# CONFIG_ARCH_USE_SECURE_MONITOR is not set # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set +# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set # CONFIG_ARCH_BOOTBLOCK_RISCV is not set # CONFIG_ARCH_VERSTAGE_RISCV is not set # CONFIG_ARCH_ROMSTAGE_RISCV is not set # CONFIG_ARCH_RAMSTAGE_RISCV is not set # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set +# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set +# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set +# CONFIG_ARCH_BOOTBLOCK_MIPS is not set +# CONFIG_ARCH_VERSTAGE_MIPS is not set +# CONFIG_ARCH_ROMSTAGE_MIPS is not set +# CONFIG_ARCH_RAMSTAGE_MIPS is not set # CONFIG_MAINBOARD_HAS_CHROMEOS is not set CONFIG_SYSTEM_TYPE_LAPTOP=y @@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set # CONFIG_CPU_TI_AM335X is not set CONFIG_XIP_ROM_SIZE=0x10000 +CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 # CONFIG_CPU_AMD_AGESA is not set # CONFIG_CPU_AMD_PI is not set CONFIG_CPU_INTEL_MODEL_1067X=y @@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set CONFIG_SOUTHBRIDGE_INTEL_COMMON=y +# CONFIG_LOCK_DOWN_BIOS is not set CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y # @@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y # CONFIG_PCIEXP_ASPM is not set # CONFIG_PCIEXP_CLK_PM is not set # CONFIG_EARLY_PCI_BRIDGE is not set +# CONFIG_PCIEXP_L1_SUB_STATE is not set CONFIG_SUBSYSTEM_VENDOR_ID=0x0000 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 # CONFIG_PXE_ROM is not set @@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 # # CONFIG_DRIVERS_AS3722_RTC is not set CONFIG_DRIVERS_GENERIC_IOAPIC=y +# CONFIG_GIC is not set # CONFIG_DRIVERS_I2C_RTD2132 is not set CONFIG_DRIVERS_ICS_954309=y # CONFIG_INTEL_DP is not set @@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y # CONFIG_DRIVER_TI_TPS65090 is not set CONFIG_DRIVERS_UART=y CONFIG_DRIVERS_UART_8250IO=y -CONFIG_NO_UART_ON_SUPERIO=y +# CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_DRIVERS_UART_8250MEM is not set # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set @@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y CONFIG_HAVE_USBDEBUG_OPTIONS=y CONFIG_USBDEBUG_IN_ROMSTAGE=y CONFIG_USBDEBUG_DEFAULT_PORT=0 -# CONFIG_USBDEBUG_DONGLE_STD is not set +CONFIG_USBDEBUG_DONGLE_STD=y # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set -CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y +# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0 # CONFIG_DRIVER_XPOWERS_AXP209 is not set # CONFIG_DRIVERS_RICOH_RCE822 is not set @@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y # CONFIG_CONSOLE_SERIAL_19200 is not set # CONFIG_CONSOLE_SERIAL_9600 is not set CONFIG_TTYS0_BAUD=115200 -CONFIG_TTYS0_LCS=3 # 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 -CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set @@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y # CONFIG_GENERATE_PIRQ_TABLE is not set CONFIG_GENERATE_SMBIOS_TABLES=y CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200" +CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400" # # Payload @@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_ACPI is not set # CONFIG_DEBUG_USBDEBUG is not set # CONFIG_TRACE is not set +# CONFIG_BOARD_ID_SUPPORT is not set # CONFIG_ENABLE_APIC_EXT_ID is not set CONFIG_WARNINGS_ARE_ERRORS=y # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set -- cgit v1.2.3-70-g09d2