diff options
author | Francis Rowe <info@gluglug.org.uk> | 2016-01-28 18:03:59 (EST) |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2016-01-28 18:03:59 (EST) |
commit | a1357659b2a72c349091a0abd7a0276b4fd6946d (patch) | |
tree | f0c77bce57774090506267e3ea14ff4eee5543a3 /resources/libreboot | |
parent | 3b56767917dccd59c4af7c289450a053982e984a (diff) | |
download | libreboot-a1357659b2a72c349091a0abd7a0276b4fd6946d.zip libreboot-a1357659b2a72c349091a0abd7a0276b4fd6946d.tar.gz libreboot-a1357659b2a72c349091a0abd7a0276b4fd6946d.tar.bz2 |
Revert "reset x60/t60/macbook21 to older coreboot revisions"
This reverts commit 3b56767917dccd59c4af7c289450a053982e984a.
Diffstat (limited to 'resources/libreboot')
31 files changed, 435 insertions, 829 deletions
diff --git a/resources/libreboot/config/grub/macbook21/cbrevision b/resources/libreboot/config/grub/macbook21/cbrevision index e39a127..5c2d606 100644 --- a/resources/libreboot/config/grub/macbook21/cbrevision +++ b/resources/libreboot/config/grub/macbook21/cbrevision @@ -1 +1 @@ -e19c8b0091022ae3f490601aed0c290cd5171b79 +33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config index 845154d..697183d 100644 --- a/resources/libreboot/config/grub/macbook21/config +++ b/resources/libreboot/config/grub/macbook21/config @@ -6,16 +6,18 @@ # # General setup # -CONFIG_EXPERT=y CONFIG_LOCALVERSION=" MB21.88Z.00A5.B07.0706270922" CONFIG_CBFS_PREFIX="fallback" +# CONFIG_MULTIPLE_CBFS_INSTANCES is not set CONFIG_COMPILER_GCC=y # CONFIG_COMPILER_LLVM_CLANG is not set # CONFIG_ANY_TOOLCHAIN is not set # CONFIG_CCACHE is not set +# CONFIG_FMD_GENPARSER is not set # CONFIG_SCONFIG_GENPARSER is not set CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y +# CONFIG_STATIC_OPTION_TABLE is not set +# CONFIG_UNCOMPRESSED_RAMSTAGE is not set CONFIG_COMPRESS_RAMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_EARLY_CBMEM_INIT=y @@ -23,15 +25,23 @@ CONFIG_EARLY_CBMEM_INIT=y # CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_RELOCATABLE_MODULES is not set +# CONFIG_RELOCATABLE_RAMSTAGE is not set +CONFIG_FLASHMAP_OFFSET=0x0 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 +# CONFIG_GENERIC_GPIO_LIB is not set +# CONFIG_BOARD_ID_AUTO is not set +# CONFIG_BOARD_ID_MANUAL is not set +# CONFIG_RAM_CODE_SUPPORT is not set +# CONFIG_ACPI_SATA_GENERATOR is not set # # Mainboard # +# CONFIG_VENDOR_A_TREND is not set # CONFIG_VENDOR_AAEON is not set # CONFIG_VENDOR_ABIT is not set # CONFIG_VENDOR_ADLINK is not set @@ -43,10 +53,10 @@ CONFIG_VENDOR_APPLE=y # CONFIG_VENDOR_ARTECGROUP is not set # CONFIG_VENDOR_ASROCK is not set # CONFIG_VENDOR_ASUS is not set -# CONFIG_VENDOR_A_TREND is not set # CONFIG_VENDOR_AVALUE is not set # CONFIG_VENDOR_AZZA is not set # CONFIG_VENDOR_BACHMANN is not set +# CONFIG_VENDOR_BAP is not set # CONFIG_VENDOR_BCOM is not set # CONFIG_VENDOR_BIFFEROS is not set # CONFIG_VENDOR_BIOSTAR is not set @@ -90,8 +100,8 @@ CONFIG_VENDOR_APPLE=y # CONFIG_VENDOR_SUNW is not set # CONFIG_VENDOR_SUPERMICRO is not set # CONFIG_VENDOR_TECHNEXION is not set -# CONFIG_VENDOR_TI is not set # CONFIG_VENDOR_THOMSON is not set +# CONFIG_VENDOR_TI is not set # CONFIG_VENDOR_TRAVERSE is not set # CONFIG_VENDOR_TYAN is not set # CONFIG_VENDOR_VIA is not set @@ -106,25 +116,23 @@ CONFIG_VGA_BIOS_ID="8086,27a2" # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set # CONFIG_VGA_BIOS is not set # CONFIG_UDELAY_IO is not set +CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX" CONFIG_DCACHE_RAM_BASE=0xffdf8000 CONFIG_DCACHE_RAM_SIZE=0x8000 # CONFIG_BOARD_APPLE_MACBOOK11 is not set CONFIG_BOARD_APPLE_MACBOOK21=y +# CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc." -# CONFIG_PCI_64BIT_PREF_MEM is not set CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 CONFIG_RAMTOP=0x200000 -CONFIG_STACK_SIZE=0x1000 CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_TTYS0_LCS=3 -CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 -CONFIG_POST_IO=y +CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_POST_DEVICE=y -CONFIG_SEABIOS_PS2_TIMEOUT=0 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y @@ -144,65 +152,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set CONFIG_COREBOOT_ROMSIZE_KB=2048 CONFIG_ROM_SIZE=0x200000 -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 -CONFIG_ARCH_RAMSTAGE_X86_32=y -CONFIG_AP_IN_SIPI_WAIT=y -# CONFIG_SIPI_VECTOR_IN_ROM is not set -CONFIG_RAMBASE=0x100000 -CONFIG_NUM_IPI_STARTS=2 -# CONFIG_ROMCC is not set -# CONFIG_LATE_CBMEM_INIT is not set -CONFIG_PC80_SYSTEM=y -CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c" -CONFIG_HAVE_CMOS_DEFAULT=y -CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" -CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c" -CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y -# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set -CONFIG_HPET_ADDRESS=0xfed00000 -# CONFIG_ARCH_BOOTBLOCK_ARM is not set -# CONFIG_ARCH_VERSTAGE_ARM is not set -# CONFIG_ARCH_ROMSTAGE_ARM is not set -# CONFIG_ARCH_RAMSTAGE_ARM is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set -# CONFIG_ARCH_VERSTAGE_ARMV4 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set -# CONFIG_ARCH_VERSTAGE_ARMV7 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set -# CONFIG_ARM_BOOTBLOCK_CUSTOM 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 # @@ -210,23 +159,41 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # # +# SoC +# +# CONFIG_SOC_BROADCOM_CYGNUS is not set +CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c" +CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c" +CONFIG_TTYS0_BASE=0x3f8 +CONFIG_EHCI_BAR=0xfef00000 +CONFIG_HEAP_SIZE=0x4000 +# CONFIG_SOC_MARVELL_BG4CD is not set +# CONFIG_SOC_NVIDIA_TEGRA124 is not set +# CONFIG_SOC_NVIDIA_TEGRA132 is not set +# CONFIG_SOC_NVIDIA_TEGRA210 is not set +# CONFIG_SOC_QC_IPQ806X is not set +# CONFIG_SOC_ROCKCHIP_RK3288 is not set +# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set +# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set +# CONFIG_SOC_UCB_RISCV is not set + +# # CPU # # CONFIG_CPU_ALLWINNER_A10 is not set -# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set -# CONFIG_CPU_TI_AM335X is not set CONFIG_SOCKET_SPECIFIC_OPTIONS=y CONFIG_XIP_ROM_SIZE=0x10000 -CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 +CONFIG_NUM_IPI_STARTS=2 # CONFIG_CPU_AMD_AGESA is not set # CONFIG_CPU_AMD_PI is not set +# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set CONFIG_CPU_INTEL_MODEL_6EX=y CONFIG_CPU_INTEL_MODEL_6FX=y -CONFIG_SMM_TSEG_SIZE=0 CONFIG_CPU_INTEL_SOCKET_MFCPGA478=y CONFIG_SSE2=y # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set +# CONFIG_CPU_TI_AM335X is not set # CONFIG_PARALLEL_CPU_INIT is not set CONFIG_UDELAY_LAPIC=y CONFIG_LAPIC_MONOTONIC_TIMER=y @@ -237,9 +204,8 @@ CONFIG_LAPIC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_LOGICAL_CPUS=y # CONFIG_SMM_TSEG is not set -# CONFIG_SMM_MODULES is not set # CONFIG_X86_AMD_FIXED_MTRRS is not set -# CONFIG_PLATFORM_USES_FSP is not set +# CONFIG_PLATFORM_USES_FSP1_0 is not set # CONFIG_PARALLEL_MP is not set # CONFIG_BACKUP_DEFAULT_SMM_REGION is not set # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set @@ -256,12 +222,12 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y # # Northbridge # -CONFIG_HEAP_SIZE=0x4000 -CONFIG_VIDEO_MB=0 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set # CONFIG_AMD_NB_CIMX is not set # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set +CONFIG_VIDEO_MB=0 # CONFIG_NORTHBRIDGE_AMD_PI is not set +CONFIG_RAMBASE=0x100000 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -269,18 +235,17 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y CONFIG_CHANNEL_XOR_RANDOMIZATION=y # CONFIG_OVERRIDE_CLOCK_DISABLE is not set # CONFIG_CHECK_SLFRCS_ON_RESUME is not set +CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_MAX_PIRQ_LINKS=4 # # Southbridge # -CONFIG_EHCI_BAR=0xfef00000 # CONFIG_AMD_SB_CIMX is not set # 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_I82801GX=y # @@ -290,19 +255,67 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y # # Embedded Controllers # - -# -# SoC -# -CONFIG_TTYS0_BASE=0x3f8 -# CONFIG_SOC_NVIDIA_TEGRA124 is not set -# CONFIG_SOC_NVIDIA_TEGRA132 is not set -CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0 -# CONFIG_SOC_QC_IPQ806X is not set -# CONFIG_SOC_ROCKCHIP_RK3288 is not set -# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set -# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set -# CONFIG_SOC_UCB_RISCV is not set +CONFIG_EC_ACPI=y +# CONFIG_MAINBOARD_HAS_CHROMEOS is not set +# CONFIG_UEFI_2_4_BINDING is not set +# CONFIG_ARCH_ARM is not set +# CONFIG_ARCH_BOOTBLOCK_ARM is not set +# CONFIG_ARCH_VERSTAGE_ARM is not set +# CONFIG_ARCH_ROMSTAGE_ARM is not set +# CONFIG_ARCH_RAMSTAGE_ARM is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set +# CONFIG_ARCH_VERSTAGE_ARMV4 is not set +# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set +# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set +# CONFIG_ARCH_VERSTAGE_ARMV7 is not set +# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set +# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set +# CONFIG_ARCH_VERSTAGE_ARMV7_M is not set +# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set +# CONFIG_ARM_LPAE is not set +# CONFIG_ARCH_ARM64 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_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_ARM64_A53_ERRATUM_843419 is not set +# CONFIG_ARCH_MIPS 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_ARCH_RISCV 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_ARCH_X86=y +CONFIG_ARCH_BOOTBLOCK_X86_32=y +CONFIG_ARCH_VERSTAGE_X86_32=y +CONFIG_ARCH_ROMSTAGE_X86_32=y +CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set +CONFIG_AP_IN_SIPI_WAIT=y +# CONFIG_SIPI_VECTOR_IN_ROM is not set +# CONFIG_ROMCC is not set +# CONFIG_LATE_CBMEM_INIT is not set +CONFIG_PC80_SYSTEM=y +CONFIG_HAVE_CMOS_DEFAULT=y +CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" +CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y +# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set +# CONFIG_COMPILE_IN_DSDT is not set # # Devices @@ -310,7 +323,6 @@ CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y CONFIG_NATIVE_VGA_INIT_USE_EDID=y CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y -# CONFIG_VGA_ROM_RUN is not set # CONFIG_ON_DEVICE_ROM_RUN is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set # CONFIG_SPD_CACHE is not set @@ -340,25 +352,32 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 # # CONFIG_DRIVERS_AS3722_RTC is not set # CONFIG_GIC is not set +# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set # CONFIG_DRIVERS_I2C_RTD2132 is not set # CONFIG_INTEL_DP is not set # CONFIG_INTEL_DDI is not set CONFIG_INTEL_EDID=y CONFIG_INTEL_INT15=y +CONFIG_INTEL_GMA_ACPI=y # CONFIG_DRIVER_INTEL_I210 is not set # CONFIG_IPMI_KCS is not set # CONFIG_DRIVERS_LENOVO_WACOM is not set # CONFIG_DRIVER_MAXIM_MAX77686 is not set # CONFIG_DRIVER_PARADE_PS8625 is not set -# CONFIG_LPC_TPM is not set CONFIG_DRIVERS_MC146818=y +# CONFIG_MAINBOARD_HAS_LPC_TPM is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set # CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_SPI_FLASH is not set +# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set # CONFIG_DRIVER_TI_TPS65090 is not set +# CONFIG_DRIVERS_TI_TPS65913 is not set +# CONFIG_DRIVERS_TI_TPS65913_RTC is not set CONFIG_DRIVERS_UART=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_DRIVERS_UART_8250MEM is not set +# CONFIG_DRIVERS_UART_8250MEM_32 is not set # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set @@ -369,10 +388,12 @@ 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_DRIVER_XPOWERS_AXP209 is not set -# CONFIG_DRIVERS_RICOH_RCE822 is not set +CONFIG_RTC=y # CONFIG_TPM is not set +CONFIG_STACK_SIZE=0x1000 CONFIG_MMCONF_SUPPORT_DEFAULT=y CONFIG_MMCONF_SUPPORT=y # CONFIG_BOOTMODE_STRAPS is not set @@ -412,11 +433,12 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_POST_DEVICE_NONE=y # CONFIG_POST_DEVICE_LPC is not set # CONFIG_POST_DEVICE_PCI_PCIE is not set +CONFIG_POST_IO=y CONFIG_POST_IO_PORT=0x80 CONFIG_HAVE_ACPI_RESUME=y -# CONFIG_HAVE_ACPI_SLIC is not set CONFIG_HAVE_HARD_RESET=y CONFIG_HAVE_MONOTONIC_TIMER=y +# CONFIG_GENERIC_UDELAY is not set # CONFIG_TIMER_QUEUE is not set CONFIG_HAVE_OPTION_TABLE=y # CONFIG_PIRQ_ROUTE is not set @@ -428,7 +450,6 @@ CONFIG_VGA=y # CONFIG_GFXUMA is not set CONFIG_HAVE_ACPI_TABLES=y CONFIG_HAVE_MP_TABLE=y -CONFIG_PER_DEVICE_ACPI_TABLES=y CONFIG_COMMON_FADT=y # @@ -437,7 +458,6 @@ CONFIG_COMMON_FADT=y CONFIG_GENERATE_MP_TABLE=y # CONFIG_GENERATE_PIRQ_TABLE is not set CONFIG_GENERATE_SMBIOS_TABLES=y -CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX" CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1" # @@ -445,13 +465,11 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1" # # CONFIG_PAYLOAD_NONE is not set CONFIG_PAYLOAD_ELF=y -# CONFIG_PAYLOAD_LINUX is not set -# CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set +# CONFIG_PAYLOAD_SEABIOS is not set +# CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set -# CONFIG_SEABIOS_VGA_COREBOOT is not set CONFIG_PAYLOAD_FILE="grub.elf" CONFIG_COMPRESSED_PAYLOAD_LZMA=y @@ -459,6 +477,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y # Debugging # # CONFIG_GDB_STUB is not set +# CONFIG_FATAL_ASSERTS is not set # CONFIG_DEBUG_CBFS is not set CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_RAM_SETUP is not set @@ -470,7 +489,6 @@ 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 diff --git a/resources/libreboot/config/grub/t60/cbrevision b/resources/libreboot/config/grub/t60/cbrevision index e39a127..5c2d606 100644 --- a/resources/libreboot/config/grub/t60/cbrevision +++ b/resources/libreboot/config/grub/t60/cbrevision @@ -1 +1 @@ -e19c8b0091022ae3f490601aed0c290cd5171b79 +33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config index 77bb0cc..b0fe9d5 100644 --- a/resources/libreboot/config/grub/t60/config +++ b/resources/libreboot/config/grub/t60/config @@ -6,16 +6,18 @@ # # General setup # -CONFIG_EXPERT=y CONFIG_LOCALVERSION="79ETE7WW (2.27 )" CONFIG_CBFS_PREFIX="fallback" +# CONFIG_MULTIPLE_CBFS_INSTANCES is not set CONFIG_COMPILER_GCC=y # CONFIG_COMPILER_LLVM_CLANG is not set # CONFIG_ANY_TOOLCHAIN is not set # CONFIG_CCACHE is not set +# CONFIG_FMD_GENPARSER is not set # CONFIG_SCONFIG_GENPARSER is not set CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y +# CONFIG_STATIC_OPTION_TABLE is not set +# CONFIG_UNCOMPRESSED_RAMSTAGE is not set CONFIG_COMPRESS_RAMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_EARLY_CBMEM_INIT=y @@ -23,15 +25,23 @@ CONFIG_EARLY_CBMEM_INIT=y # CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_RELOCATABLE_MODULES is not set +# CONFIG_RELOCATABLE_RAMSTAGE is not set +CONFIG_FLASHMAP_OFFSET=0x0 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 +# CONFIG_GENERIC_GPIO_LIB is not set +# CONFIG_BOARD_ID_AUTO is not set +# CONFIG_BOARD_ID_MANUAL is not set +# CONFIG_RAM_CODE_SUPPORT is not set +# CONFIG_ACPI_SATA_GENERATOR is not set # # Mainboard # +# CONFIG_VENDOR_A_TREND is not set # CONFIG_VENDOR_AAEON is not set # CONFIG_VENDOR_ABIT is not set # CONFIG_VENDOR_ADLINK is not set @@ -43,10 +53,10 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" # CONFIG_VENDOR_ARTECGROUP is not set # CONFIG_VENDOR_ASROCK is not set # CONFIG_VENDOR_ASUS is not set -# CONFIG_VENDOR_A_TREND is not set # CONFIG_VENDOR_AVALUE is not set # CONFIG_VENDOR_AZZA is not set # CONFIG_VENDOR_BACHMANN is not set +# CONFIG_VENDOR_BAP is not set # CONFIG_VENDOR_BCOM is not set # CONFIG_VENDOR_BIFFEROS is not set # CONFIG_VENDOR_BIOSTAR is not set @@ -90,8 +100,8 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_SUNW is not set # CONFIG_VENDOR_SUPERMICRO is not set # CONFIG_VENDOR_TECHNEXION is not set -# CONFIG_VENDOR_TI is not set # CONFIG_VENDOR_THOMSON is not set +# CONFIG_VENDOR_TI is not set # CONFIG_VENDOR_TRAVERSE is not set # CONFIG_VENDOR_TYAN is not set # CONFIG_VENDOR_VIA is not set @@ -109,38 +119,31 @@ CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DCACHE_RAM_BASE=0xffdf8000 CONFIG_DCACHE_RAM_SIZE=0x8000 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 -CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" -# CONFIG_PCI_64BIT_PREF_MEM is not set CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 CONFIG_RAMTOP=0x200000 -CONFIG_STACK_SIZE=0x1000 CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_TTYS0_LCS=3 -CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 -CONFIG_POST_IO=y +CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_POST_DEVICE=y -# CONFIG_BOARD_LENOVO_X60 is not set -# CONFIG_BOARD_LENOVO_X200 is not set -# CONFIG_BOARD_LENOVO_X201 is not set -# CONFIG_BOARD_LENOVO_X220 is not set -# CONFIG_BOARD_LENOVO_X230 is not set +# CONFIG_BOARD_LENOVO_G505S is not set # CONFIG_BOARD_LENOVO_T400 is not set # CONFIG_BOARD_LENOVO_T420S is not set # CONFIG_BOARD_LENOVO_T430S is not set -# CONFIG_BOARD_LENOVO_T500 is not set # CONFIG_BOARD_LENOVO_T520 is not set # CONFIG_BOARD_LENOVO_T530 is not set CONFIG_BOARD_LENOVO_T60=y -# CONFIG_BOARD_LENOVO_G505S is not set -# CONFIG_BOARD_LENOVO_R400 is not set +# CONFIG_BOARD_LENOVO_X200 is not set +# CONFIG_BOARD_LENOVO_X201 is not set +# CONFIG_BOARD_LENOVO_X220 is not set +# CONFIG_BOARD_LENOVO_X230 is not set +# CONFIG_BOARD_LENOVO_X60 is not set CONFIG_SEABIOS_PS2_TIMEOUT=3000 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_MAINBOARD_VERSION="ThinkPad T60" CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_BOARD_ROMSIZE_KB_2048=y @@ -156,65 +159,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set CONFIG_COREBOOT_ROMSIZE_KB=2048 CONFIG_ROM_SIZE=0x200000 -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 -CONFIG_ARCH_RAMSTAGE_X86_32=y -CONFIG_AP_IN_SIPI_WAIT=y -# CONFIG_SIPI_VECTOR_IN_ROM is not set -CONFIG_RAMBASE=0x100000 -CONFIG_NUM_IPI_STARTS=2 -# CONFIG_ROMCC is not set -# CONFIG_LATE_CBMEM_INIT is not set -CONFIG_PC80_SYSTEM=y -CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c" -CONFIG_HAVE_CMOS_DEFAULT=y -CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" -CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c" -CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y -# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set -CONFIG_HPET_ADDRESS=0xfed00000 -# CONFIG_ARCH_BOOTBLOCK_ARM is not set -# CONFIG_ARCH_VERSTAGE_ARM is not set -# CONFIG_ARCH_ROMSTAGE_ARM is not set -# CONFIG_ARCH_RAMSTAGE_ARM is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set -# CONFIG_ARCH_VERSTAGE_ARMV4 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set -# CONFIG_ARCH_VERSTAGE_ARMV7 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set -# CONFIG_ARM_BOOTBLOCK_CUSTOM 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 # @@ -222,23 +166,41 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # # +# SoC +# +# CONFIG_SOC_BROADCOM_CYGNUS is not set +CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c" +CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c" +CONFIG_TTYS0_BASE=0x3f8 +CONFIG_EHCI_BAR=0xfef00000 +CONFIG_HEAP_SIZE=0x4000 +# CONFIG_SOC_MARVELL_BG4CD is not set +# CONFIG_SOC_NVIDIA_TEGRA124 is not set +# CONFIG_SOC_NVIDIA_TEGRA132 is not set +# CONFIG_SOC_NVIDIA_TEGRA210 is not set +# CONFIG_SOC_QC_IPQ806X is not set +# CONFIG_SOC_ROCKCHIP_RK3288 is not set +# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set +# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set +# CONFIG_SOC_UCB_RISCV is not set + +# # CPU # # CONFIG_CPU_ALLWINNER_A10 is not set -# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set -# CONFIG_CPU_TI_AM335X is not set CONFIG_SOCKET_SPECIFIC_OPTIONS=y CONFIG_XIP_ROM_SIZE=0x10000 -CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 +CONFIG_NUM_IPI_STARTS=2 # CONFIG_CPU_AMD_AGESA is not set # CONFIG_CPU_AMD_PI is not set +# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set CONFIG_CPU_INTEL_MODEL_6EX=y CONFIG_CPU_INTEL_MODEL_6FX=y -CONFIG_SMM_TSEG_SIZE=0 CONFIG_CPU_INTEL_SOCKET_MFCPGA478=y CONFIG_SSE2=y # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set +# CONFIG_CPU_TI_AM335X is not set # CONFIG_PARALLEL_CPU_INIT is not set CONFIG_UDELAY_LAPIC=y CONFIG_LAPIC_MONOTONIC_TIMER=y @@ -249,9 +211,8 @@ CONFIG_LAPIC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_LOGICAL_CPUS=y # CONFIG_SMM_TSEG is not set -# CONFIG_SMM_MODULES is not set # CONFIG_X86_AMD_FIXED_MTRRS is not set -# CONFIG_PLATFORM_USES_FSP is not set +# CONFIG_PLATFORM_USES_FSP1_0 is not set # CONFIG_PARALLEL_MP is not set # CONFIG_BACKUP_DEFAULT_SMM_REGION is not set # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set @@ -268,12 +229,12 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y # # Northbridge # -CONFIG_HEAP_SIZE=0x4000 -CONFIG_VIDEO_MB=0 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set # CONFIG_AMD_NB_CIMX is not set # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set +CONFIG_VIDEO_MB=0 # CONFIG_NORTHBRIDGE_AMD_PI is not set +CONFIG_RAMBASE=0x100000 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -281,18 +242,17 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y CONFIG_CHANNEL_XOR_RANDOMIZATION=y # CONFIG_OVERRIDE_CLOCK_DISABLE is not set # CONFIG_CHECK_SLFRCS_ON_RESUME is not set +CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_MAX_PIRQ_LINKS=4 # # Southbridge # -CONFIG_EHCI_BAR=0xfef00000 # CONFIG_AMD_SB_CIMX is not set # 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_I82801GX=y CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y @@ -309,19 +269,66 @@ CONFIG_EC_ACPI=y CONFIG_EC_LENOVO_H8=y CONFIG_H8_DOCK_EARLY_INIT=y CONFIG_EC_LENOVO_PMH7=y - -# -# SoC -# -CONFIG_TTYS0_BASE=0x3f8 -# CONFIG_SOC_NVIDIA_TEGRA124 is not set -# CONFIG_SOC_NVIDIA_TEGRA132 is not set -CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0 -# CONFIG_SOC_QC_IPQ806X is not set -# CONFIG_SOC_ROCKCHIP_RK3288 is not set -# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set -# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set -# CONFIG_SOC_UCB_RISCV is not set +# CONFIG_MAINBOARD_HAS_CHROMEOS is not set +# CONFIG_UEFI_2_4_BINDING is not set +# CONFIG_ARCH_ARM is not set +# CONFIG_ARCH_BOOTBLOCK_ARM is not set +# CONFIG_ARCH_VERSTAGE_ARM is not set +# CONFIG_ARCH_ROMSTAGE_ARM is not set +# CONFIG_ARCH_RAMSTAGE_ARM is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set +# CONFIG_ARCH_VERSTAGE_ARMV4 is not set +# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set +# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set +# CONFIG_ARCH_VERSTAGE_ARMV7 is not set +# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set +# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set +# CONFIG_ARCH_VERSTAGE_ARMV7_M is not set +# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set +# CONFIG_ARM_LPAE is not set +# CONFIG_ARCH_ARM64 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_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_ARM64_A53_ERRATUM_843419 is not set +# CONFIG_ARCH_MIPS 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_ARCH_RISCV 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_ARCH_X86=y +CONFIG_ARCH_BOOTBLOCK_X86_32=y +CONFIG_ARCH_VERSTAGE_X86_32=y +CONFIG_ARCH_ROMSTAGE_X86_32=y +CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set +CONFIG_AP_IN_SIPI_WAIT=y +# CONFIG_SIPI_VECTOR_IN_ROM is not set +# CONFIG_ROMCC is not set +# CONFIG_LATE_CBMEM_INIT is not set +CONFIG_PC80_SYSTEM=y +CONFIG_HAVE_CMOS_DEFAULT=y +CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" +CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y +# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set +# CONFIG_COMPILE_IN_DSDT is not set # # Devices @@ -329,7 +336,6 @@ CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y CONFIG_NATIVE_VGA_INIT_USE_EDID=y CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y -# CONFIG_VGA_ROM_RUN is not set # CONFIG_ON_DEVICE_ROM_RUN is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set # CONFIG_SPD_CACHE is not set @@ -359,26 +365,33 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 # # CONFIG_DRIVERS_AS3722_RTC is not set # CONFIG_GIC is not set +CONFIG_SMBIOS_PROVIDED_BY_MOBO=y # CONFIG_DRIVERS_I2C_RTD2132 is not set CONFIG_DRIVERS_ICS_954309=y # CONFIG_INTEL_DP is not set # CONFIG_INTEL_DDI is not set CONFIG_INTEL_EDID=y CONFIG_INTEL_INT15=y +CONFIG_INTEL_GMA_ACPI=y # CONFIG_DRIVER_INTEL_I210 is not set # CONFIG_IPMI_KCS is not set # CONFIG_DRIVERS_LENOVO_WACOM is not set # CONFIG_DRIVER_MAXIM_MAX77686 is not set # CONFIG_DRIVER_PARADE_PS8625 is not set -# CONFIG_LPC_TPM is not set CONFIG_DRIVERS_MC146818=y +# CONFIG_MAINBOARD_HAS_LPC_TPM is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set # CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_SPI_FLASH is not set +# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set # CONFIG_DRIVER_TI_TPS65090 is not set +# CONFIG_DRIVERS_TI_TPS65913 is not set +# CONFIG_DRIVERS_TI_TPS65913_RTC is not set CONFIG_DRIVERS_UART=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_DRIVERS_UART_8250MEM is not set +# CONFIG_DRIVERS_UART_8250MEM_32 is not set # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set @@ -389,10 +402,12 @@ 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_DRIVER_XPOWERS_AXP209 is not set -# CONFIG_DRIVERS_RICOH_RCE822 is not set +CONFIG_RTC=y # CONFIG_TPM is not set +CONFIG_STACK_SIZE=0x1000 CONFIG_MMCONF_SUPPORT_DEFAULT=y CONFIG_MMCONF_SUPPORT=y # CONFIG_BOOTMODE_STRAPS is not set @@ -432,11 +447,12 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_POST_DEVICE_NONE=y # CONFIG_POST_DEVICE_LPC is not set # CONFIG_POST_DEVICE_PCI_PCIE is not set +CONFIG_POST_IO=y CONFIG_POST_IO_PORT=0x80 CONFIG_HAVE_ACPI_RESUME=y -# CONFIG_HAVE_ACPI_SLIC is not set CONFIG_HAVE_HARD_RESET=y CONFIG_HAVE_MONOTONIC_TIMER=y +# CONFIG_GENERIC_UDELAY is not set # CONFIG_TIMER_QUEUE is not set CONFIG_HAVE_OPTION_TABLE=y # CONFIG_PIRQ_ROUTE is not set @@ -448,7 +464,6 @@ CONFIG_VGA=y # CONFIG_GFXUMA is not set CONFIG_HAVE_ACPI_TABLES=y CONFIG_HAVE_MP_TABLE=y -CONFIG_PER_DEVICE_ACPI_TABLES=y CONFIG_COMMON_FADT=y # @@ -457,21 +472,17 @@ CONFIG_COMMON_FADT=y CONFIG_GENERATE_MP_TABLE=y # CONFIG_GENERATE_PIRQ_TABLE is not set CONFIG_GENERATE_SMBIOS_TABLES=y -CONFIG_MAINBOARD_SERIAL_NUMBER="L3DKE06" -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1951FEG" # # Payload # # CONFIG_PAYLOAD_NONE is not set CONFIG_PAYLOAD_ELF=y -# CONFIG_PAYLOAD_LINUX is not set -# CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set +# CONFIG_PAYLOAD_SEABIOS is not set +# CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set -# CONFIG_SEABIOS_VGA_COREBOOT is not set CONFIG_PAYLOAD_FILE="grub.elf" CONFIG_COMPRESSED_PAYLOAD_LZMA=y @@ -479,6 +490,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y # Debugging # # CONFIG_GDB_STUB is not set +# CONFIG_FATAL_ASSERTS is not set # CONFIG_DEBUG_CBFS is not set CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_RAM_SETUP is not set @@ -490,7 +502,6 @@ 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 diff --git a/resources/libreboot/config/grub/x60/cbrevision b/resources/libreboot/config/grub/x60/cbrevision index e39a127..5c2d606 100644 --- a/resources/libreboot/config/grub/x60/cbrevision +++ b/resources/libreboot/config/grub/x60/cbrevision @@ -1 +1 @@ -e19c8b0091022ae3f490601aed0c290cd5171b79 +33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config index 1494283..143630f 100644 --- a/resources/libreboot/config/grub/x60/config +++ b/resources/libreboot/config/grub/x60/config @@ -6,16 +6,18 @@ # # General setup # -CONFIG_EXPERT=y CONFIG_LOCALVERSION="" CONFIG_CBFS_PREFIX="fallback" +# CONFIG_MULTIPLE_CBFS_INSTANCES is not set CONFIG_COMPILER_GCC=y # CONFIG_COMPILER_LLVM_CLANG is not set # CONFIG_ANY_TOOLCHAIN is not set # CONFIG_CCACHE is not set +# CONFIG_FMD_GENPARSER is not set # CONFIG_SCONFIG_GENPARSER is not set CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y +# CONFIG_STATIC_OPTION_TABLE is not set +# CONFIG_UNCOMPRESSED_RAMSTAGE is not set CONFIG_COMPRESS_RAMSTAGE=y CONFIG_INCLUDE_CONFIG_FILE=y CONFIG_EARLY_CBMEM_INIT=y @@ -23,15 +25,23 @@ CONFIG_EARLY_CBMEM_INIT=y # CONFIG_USE_BLOBS is not set # CONFIG_COVERAGE is not set # CONFIG_RELOCATABLE_MODULES is not set +# CONFIG_RELOCATABLE_RAMSTAGE is not set +CONFIG_FLASHMAP_OFFSET=0x0 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 +# CONFIG_GENERIC_GPIO_LIB is not set +# CONFIG_BOARD_ID_AUTO is not set +# CONFIG_BOARD_ID_MANUAL is not set +# CONFIG_RAM_CODE_SUPPORT is not set +# CONFIG_ACPI_SATA_GENERATOR is not set # # Mainboard # +# CONFIG_VENDOR_A_TREND is not set # CONFIG_VENDOR_AAEON is not set # CONFIG_VENDOR_ABIT is not set # CONFIG_VENDOR_ADLINK is not set @@ -43,10 +53,10 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c" # CONFIG_VENDOR_ARTECGROUP is not set # CONFIG_VENDOR_ASROCK is not set # CONFIG_VENDOR_ASUS is not set -# CONFIG_VENDOR_A_TREND is not set # CONFIG_VENDOR_AVALUE is not set # CONFIG_VENDOR_AZZA is not set # CONFIG_VENDOR_BACHMANN is not set +# CONFIG_VENDOR_BAP is not set # CONFIG_VENDOR_BCOM is not set # CONFIG_VENDOR_BIFFEROS is not set # CONFIG_VENDOR_BIOSTAR is not set @@ -90,8 +100,8 @@ CONFIG_VENDOR_LENOVO=y # CONFIG_VENDOR_SUNW is not set # CONFIG_VENDOR_SUPERMICRO is not set # CONFIG_VENDOR_TECHNEXION is not set -# CONFIG_VENDOR_TI is not set # CONFIG_VENDOR_THOMSON is not set +# CONFIG_VENDOR_TI is not set # CONFIG_VENDOR_TRAVERSE is not set # CONFIG_VENDOR_TYAN is not set # CONFIG_VENDOR_VIA is not set @@ -110,38 +120,31 @@ CONFIG_VGA_BIOS_ID="8086,27a2" CONFIG_DCACHE_RAM_BASE=0xffdf8000 CONFIG_DCACHE_RAM_SIZE=0x8000 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000 -CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO" -# CONFIG_PCI_64BIT_PREF_MEM is not set CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y CONFIG_UART_FOR_CONSOLE=0 CONFIG_ID_SECTION_OFFSET=0x80 CONFIG_RAMTOP=0x200000 -CONFIG_STACK_SIZE=0x1000 CONFIG_USBDEBUG_HCD_INDEX=0 CONFIG_TTYS0_LCS=3 -CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_CBFS_SIZE=0x200000 -CONFIG_POST_IO=y +CONFIG_CACHE_ROM_SIZE_OVERRIDE=0 CONFIG_POST_DEVICE=y -CONFIG_BOARD_LENOVO_X60=y -# CONFIG_BOARD_LENOVO_X200 is not set -# CONFIG_BOARD_LENOVO_X201 is not set -# CONFIG_BOARD_LENOVO_X220 is not set -# CONFIG_BOARD_LENOVO_X230 is not set +# CONFIG_BOARD_LENOVO_G505S is not set # CONFIG_BOARD_LENOVO_T400 is not set # CONFIG_BOARD_LENOVO_T420S is not set # CONFIG_BOARD_LENOVO_T430S is not set -# CONFIG_BOARD_LENOVO_T500 is not set # CONFIG_BOARD_LENOVO_T520 is not set # CONFIG_BOARD_LENOVO_T530 is not set # CONFIG_BOARD_LENOVO_T60 is not set -# CONFIG_BOARD_LENOVO_G505S is not set -# CONFIG_BOARD_LENOVO_R400 is not set +# CONFIG_BOARD_LENOVO_X200 is not set +# CONFIG_BOARD_LENOVO_X201 is not set +# CONFIG_BOARD_LENOVO_X220 is not set +# CONFIG_BOARD_LENOVO_X230 is not set +CONFIG_BOARD_LENOVO_X60=y CONFIG_SEABIOS_PS2_TIMEOUT=3000 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_MAINBOARD_VERSION="1.0" CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 CONFIG_BOARD_ROMSIZE_KB_2048=y @@ -157,65 +160,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set CONFIG_COREBOOT_ROMSIZE_KB=2048 CONFIG_ROM_SIZE=0x200000 -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 -CONFIG_ARCH_RAMSTAGE_X86_32=y -CONFIG_AP_IN_SIPI_WAIT=y -# CONFIG_SIPI_VECTOR_IN_ROM is not set -CONFIG_RAMBASE=0x100000 -CONFIG_NUM_IPI_STARTS=2 -# CONFIG_ROMCC is not set -# CONFIG_LATE_CBMEM_INIT is not set -CONFIG_PC80_SYSTEM=y -CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c" -CONFIG_HAVE_CMOS_DEFAULT=y -CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" -CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c" -CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y -# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set -CONFIG_HPET_ADDRESS=0xfed00000 -# CONFIG_ARCH_BOOTBLOCK_ARM is not set -# CONFIG_ARCH_VERSTAGE_ARM is not set -# CONFIG_ARCH_ROMSTAGE_ARM is not set -# CONFIG_ARCH_RAMSTAGE_ARM is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set -# CONFIG_ARCH_VERSTAGE_ARMV4 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set -# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set -# CONFIG_ARCH_VERSTAGE_ARMV7 is not set -# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set -# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set -# CONFIG_ARM_BOOTBLOCK_CUSTOM 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 # @@ -223,23 +167,41 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y # # +# SoC +# +# CONFIG_SOC_BROADCOM_CYGNUS is not set +CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c" +CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c" +CONFIG_TTYS0_BASE=0x3f8 +CONFIG_EHCI_BAR=0xfef00000 +CONFIG_HEAP_SIZE=0x4000 +# CONFIG_SOC_MARVELL_BG4CD is not set +# CONFIG_SOC_NVIDIA_TEGRA124 is not set +# CONFIG_SOC_NVIDIA_TEGRA132 is not set +# CONFIG_SOC_NVIDIA_TEGRA210 is not set +# CONFIG_SOC_QC_IPQ806X is not set +# CONFIG_SOC_ROCKCHIP_RK3288 is not set +# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set +# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set +# CONFIG_SOC_UCB_RISCV is not set + +# # CPU # # CONFIG_CPU_ALLWINNER_A10 is not set -# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set -# CONFIG_CPU_TI_AM335X is not set CONFIG_SOCKET_SPECIFIC_OPTIONS=y CONFIG_XIP_ROM_SIZE=0x10000 -CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00 +CONFIG_NUM_IPI_STARTS=2 # CONFIG_CPU_AMD_AGESA is not set # CONFIG_CPU_AMD_PI is not set +# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set CONFIG_CPU_INTEL_MODEL_6EX=y CONFIG_CPU_INTEL_MODEL_6FX=y -CONFIG_SMM_TSEG_SIZE=0 CONFIG_CPU_INTEL_SOCKET_MFCPGA478=y CONFIG_SSE2=y # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set +# CONFIG_CPU_TI_AM335X is not set # CONFIG_PARALLEL_CPU_INIT is not set CONFIG_UDELAY_LAPIC=y CONFIG_LAPIC_MONOTONIC_TIMER=y @@ -250,9 +212,8 @@ CONFIG_LAPIC_MONOTONIC_TIMER=y CONFIG_TSC_SYNC_MFENCE=y CONFIG_LOGICAL_CPUS=y # CONFIG_SMM_TSEG is not set -# CONFIG_SMM_MODULES is not set # CONFIG_X86_AMD_FIXED_MTRRS is not set -# CONFIG_PLATFORM_USES_FSP is not set +# CONFIG_PLATFORM_USES_FSP1_0 is not set # CONFIG_PARALLEL_MP is not set # CONFIG_BACKUP_DEFAULT_SMM_REGION is not set # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set @@ -269,12 +230,12 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y # # Northbridge # -CONFIG_HEAP_SIZE=0x4000 -CONFIG_VIDEO_MB=0 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set # CONFIG_AMD_NB_CIMX is not set # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set +CONFIG_VIDEO_MB=0 # CONFIG_NORTHBRIDGE_AMD_PI is not set +CONFIG_RAMBASE=0x100000 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y CONFIG_NORTHBRIDGE_INTEL_I945=y # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set @@ -282,18 +243,17 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y CONFIG_CHANNEL_XOR_RANDOMIZATION=y # CONFIG_OVERRIDE_CLOCK_DISABLE is not set # CONFIG_CHECK_SLFRCS_ON_RESUME is not set +CONFIG_HPET_ADDRESS=0xfed00000 CONFIG_HPET_MIN_TICKS=0x80 CONFIG_MAX_PIRQ_LINKS=4 # # Southbridge # -CONFIG_EHCI_BAR=0xfef00000 # CONFIG_AMD_SB_CIMX is not set # 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_I82801GX=y CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y @@ -310,19 +270,66 @@ CONFIG_EC_ACPI=y CONFIG_EC_LENOVO_H8=y CONFIG_H8_DOCK_EARLY_INIT=y CONFIG_EC_LENOVO_PMH7=y - -# -# SoC -# -CONFIG_TTYS0_BASE=0x3f8 -# CONFIG_SOC_NVIDIA_TEGRA124 is not set -# CONFIG_SOC_NVIDIA_TEGRA132 is not set -CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0 -# CONFIG_SOC_QC_IPQ806X is not set -# CONFIG_SOC_ROCKCHIP_RK3288 is not set -# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set -# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set -# CONFIG_SOC_UCB_RISCV is not set +# CONFIG_MAINBOARD_HAS_CHROMEOS is not set +# CONFIG_UEFI_2_4_BINDING is not set +# CONFIG_ARCH_ARM is not set +# CONFIG_ARCH_BOOTBLOCK_ARM is not set +# CONFIG_ARCH_VERSTAGE_ARM is not set +# CONFIG_ARCH_ROMSTAGE_ARM is not set +# CONFIG_ARCH_RAMSTAGE_ARM is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set +# CONFIG_ARCH_VERSTAGE_ARMV4 is not set +# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set +# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set +# CONFIG_ARCH_VERSTAGE_ARMV7 is not set +# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set +# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set +# CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set +# CONFIG_ARCH_VERSTAGE_ARMV7_M is not set +# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set +# CONFIG_ARM_LPAE is not set +# CONFIG_ARCH_ARM64 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_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_ARM64_A53_ERRATUM_843419 is not set +# CONFIG_ARCH_MIPS 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_ARCH_RISCV 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_ARCH_X86=y +CONFIG_ARCH_BOOTBLOCK_X86_32=y +CONFIG_ARCH_VERSTAGE_X86_32=y +CONFIG_ARCH_ROMSTAGE_X86_32=y +CONFIG_ARCH_RAMSTAGE_X86_32=y +# CONFIG_ARCH_BOOTBLOCK_X86_64 is not set +# CONFIG_ARCH_VERSTAGE_X86_64 is not set +# CONFIG_ARCH_ROMSTAGE_X86_64 is not set +# CONFIG_ARCH_RAMSTAGE_X86_64 is not set +CONFIG_AP_IN_SIPI_WAIT=y +# CONFIG_SIPI_VECTOR_IN_ROM is not set +# CONFIG_ROMCC is not set +# CONFIG_LATE_CBMEM_INIT is not set +CONFIG_PC80_SYSTEM=y +CONFIG_HAVE_CMOS_DEFAULT=y +CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default" +CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y +# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set +# CONFIG_COMPILE_IN_DSDT is not set # # Devices @@ -330,7 +337,6 @@ CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y CONFIG_NATIVE_VGA_INIT_USE_EDID=y CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y -# CONFIG_VGA_ROM_RUN is not set # CONFIG_ON_DEVICE_ROM_RUN is not set # CONFIG_MULTIPLE_VGA_ADAPTERS is not set # CONFIG_SPD_CACHE is not set @@ -360,12 +366,14 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000 # # CONFIG_DRIVERS_AS3722_RTC is not set # CONFIG_GIC is not set +CONFIG_SMBIOS_PROVIDED_BY_MOBO=y # CONFIG_DRIVERS_I2C_RTD2132 is not set CONFIG_DRIVERS_ICS_954309=y # CONFIG_INTEL_DP is not set # CONFIG_INTEL_DDI is not set CONFIG_INTEL_EDID=y CONFIG_INTEL_INT15=y +CONFIG_INTEL_GMA_ACPI=y # CONFIG_DRIVER_INTEL_I210 is not set # CONFIG_IPMI_KCS is not set CONFIG_DRIVERS_LENOVO_WACOM=y @@ -374,15 +382,20 @@ CONFIG_DIGITIZER_PRESENT=y # CONFIG_DIGITIZER_ABSENT is not set # CONFIG_DRIVER_MAXIM_MAX77686 is not set # CONFIG_DRIVER_PARADE_PS8625 is not set -# CONFIG_LPC_TPM is not set CONFIG_DRIVERS_MC146818=y +# CONFIG_MAINBOARD_HAS_LPC_TPM is not set +# CONFIG_DRIVERS_RICOH_RCE822 is not set # CONFIG_DRIVERS_SIL_3114 is not set # CONFIG_SPI_FLASH is not set +# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set # CONFIG_DRIVER_TI_TPS65090 is not set +# CONFIG_DRIVERS_TI_TPS65913 is not set +# CONFIG_DRIVERS_TI_TPS65913_RTC is not set CONFIG_DRIVERS_UART=y CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_UART_ON_SUPERIO is not set # CONFIG_DRIVERS_UART_8250MEM is not set +# CONFIG_DRIVERS_UART_8250MEM_32 is not set # CONFIG_HAVE_UART_SPECIAL is not set # CONFIG_DRIVERS_UART_OXPCIE is not set # CONFIG_DRIVERS_UART_PL011 is not set @@ -393,10 +406,12 @@ 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_DRIVER_XPOWERS_AXP209 is not set -# CONFIG_DRIVERS_RICOH_RCE822 is not set +CONFIG_RTC=y # CONFIG_TPM is not set +CONFIG_STACK_SIZE=0x1000 CONFIG_MMCONF_SUPPORT_DEFAULT=y CONFIG_MMCONF_SUPPORT=y # CONFIG_BOOTMODE_STRAPS is not set @@ -436,11 +451,12 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_POST_DEVICE_NONE=y # CONFIG_POST_DEVICE_LPC is not set # CONFIG_POST_DEVICE_PCI_PCIE is not set +CONFIG_POST_IO=y CONFIG_POST_IO_PORT=0x80 CONFIG_HAVE_ACPI_RESUME=y -# CONFIG_HAVE_ACPI_SLIC is not set CONFIG_HAVE_HARD_RESET=y CONFIG_HAVE_MONOTONIC_TIMER=y +# CONFIG_GENERIC_UDELAY is not set # CONFIG_TIMER_QUEUE is not set CONFIG_HAVE_OPTION_TABLE=y # CONFIG_PIRQ_ROUTE is not set @@ -453,7 +469,6 @@ CONFIG_VGA=y CONFIG_HAVE_ACPI_TABLES=y CONFIG_HAVE_MP_TABLE=y CONFIG_HAVE_PIRQ_TABLE=y -CONFIG_PER_DEVICE_ACPI_TABLES=y CONFIG_COMMON_FADT=y # @@ -462,21 +477,17 @@ CONFIG_COMMON_FADT=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_SMBIOS_TABLES=y -CONFIG_MAINBOARD_SERIAL_NUMBER="123456789" -CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60" # # Payload # # CONFIG_PAYLOAD_NONE is not set CONFIG_PAYLOAD_ELF=y -# CONFIG_PAYLOAD_LINUX is not set -# CONFIG_PAYLOAD_SEABIOS is not set # CONFIG_PAYLOAD_FILO is not set # CONFIG_PAYLOAD_GRUB2 is not set +# CONFIG_PAYLOAD_SEABIOS is not set +# CONFIG_PAYLOAD_LINUX is not set # CONFIG_PAYLOAD_TIANOCORE is not set -# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set -# CONFIG_SEABIOS_VGA_COREBOOT is not set CONFIG_PAYLOAD_FILE="grub.elf" CONFIG_COMPRESSED_PAYLOAD_LZMA=y @@ -484,6 +495,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y # Debugging # # CONFIG_GDB_STUB is not set +# CONFIG_FATAL_ASSERTS is not set # CONFIG_DEBUG_CBFS is not set CONFIG_HAVE_DEBUG_RAM_SETUP=y # CONFIG_DEBUG_RAM_SETUP is not set @@ -496,7 +508,6 @@ 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 diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list index e801b8c..fe69c35 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_4mb/reused.list @@ -1,4 +1,4 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list index bcbb7fe..7a1a07b 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/reused.list @@ -1,3 +1,3 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list index bcbb7fe..7a1a07b 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_4mb/reused.list @@ -1,3 +1,3 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list index 5bd12d0..410ee71 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/reused.list @@ -1 +1 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list index c7c8d20..d5051b8 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_4mb/reused.list @@ -1,4 +1,4 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list index e801b8c..fe69c35 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t500_8mb/reused.list @@ -1,4 +1,4 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0002-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/r400_8mb/0001-lenovo-r400-Add-clone-of-Lenovo-T400.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch new file mode 100644 index 0000000..ec6b33e --- /dev/null +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/0001-lenovo-t60-Enable-brightness-controls-native-graphic.patch @@ -0,0 +1,36 @@ +From 770021ce66a0fddebb9639c4df0696ecfca45488 Mon Sep 17 00:00:00 2001 +From: Francis Rowe <info@gluglug.org.uk> +Date: Mon, 15 Jun 2015 19:59:46 +0100 +Subject: [PATCH 4/9] lenovo/t60: Enable brightness controls (native graphics) + +This makes the Fn Home/End keys work for controlling the +brightness of the display. Value obtained by reading +BLC_PWM_CTL when running the VBIOS (option ROM). + +On i945 legacy brightness control is enabled by a single +bit in BLC_PWM_CTL. It's bit 16 or bit 0 (the other one +reverses polarity). Set the bit to enable brightness +controls. + +Change-Id: I22e261f2ce28ec81cd208a73e6311ec67146eb72 +Signed-off-by: Francis Rowe <info@gluglug.org.uk> +--- + src/mainboard/lenovo/t60/devicetree.cb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb +index b28f1ad..9e6ce02 100644 +--- a/src/mainboard/lenovo/t60/devicetree.cb ++++ b/src/mainboard/lenovo/t60/devicetree.cb +@@ -26,7 +26,7 @@ chip northbridge/intel/i945 + + register "gpu_hotplug" = "0x00000220" + register "gpu_lvds_use_spread_spectrum_clock" = "1" +- register "gpu_backlight" = "0x1280128" ++ register "gpu_backlight" = "0x58BF58BE" + + device cpu_cluster 0 on + chip cpu/intel/socket_mFCPGA478 +-- +1.9.1 + diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/INFO new file mode 100644 index 0000000..cb543aa --- /dev/null +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/INFO @@ -0,0 +1,3 @@ +printf "lenovo/t60: Enable brightness controls (native graphics)\n" +git am "../resources/libreboot/patch/misc/0004-lenovo-t60-Enable-brightness-controls-native-graphic.patch" +# git fetch http://review.coreboot.org/coreboot refs/changes/52/10552/2 && git cherry-pick FETCH_HEAD diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/reused.list new file mode 100644 index 0000000..410ee71 --- /dev/null +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t60/reused.list @@ -0,0 +1 @@ +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list index 40c0d61..1b47b43 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_4mb/reused.list @@ -1,2 +1,2 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch /resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/0001-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list index 5bd12d0..410ee71 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x200_8mb/reused.list @@ -1 +1 @@ -/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch index b088d3e..b088d3e 100644 --- a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/t400_8mb/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch index 1c5b4b3..4afc7f5 100644 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/0002-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch @@ -1,26 +1,27 @@ -From 89f4c7561e486030d867674e4df2978a7260c4a7 Mon Sep 17 00:00:00 2001 +From e4b5b65c93122126344771f2042f8d7a3468be19 Mon Sep 17 00:00:00 2001 From: Francis Rowe <info@gluglug.org.uk> -Date: Sat, 11 Oct 2014 16:43:28 +0100 -Subject: [PATCH 14/22] lenovo/x60: Enable legacy brightness controls (native - graphics) +Date: Mon, 22 Jun 2015 17:37:06 +0100 +Subject: [PATCH 3/9] lenovo/x60: use correct BLC_PWM_CTL value -Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM). +Bit 16 in BLC_PWM_CTL enables brightness controls, but the +current value is generic. Use the proper value, obtained +by reading BLC_PWM_CTL while running the VBIOS. -Change-Id: Id855c4e91fe71fb489739e62fbe99ca22841acd2 +Change-Id: Ib273359e1c285b405a9bb26fc217c2f7e255b99f Signed-off-by: Francis Rowe <info@gluglug.org.uk> --- src/mainboard/lenovo/x60/devicetree.cb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb -index 382ebaf..4e02d3c 100644 +index b4d1144..4d62116 100644 --- a/src/mainboard/lenovo/x60/devicetree.cb +++ b/src/mainboard/lenovo/x60/devicetree.cb -@@ -25,7 +25,7 @@ chip northbridge/intel/i945 +@@ -26,7 +26,7 @@ chip northbridge/intel/i945 + register "gpu_hotplug" = "0x00000220" register "gpu_lvds_use_spread_spectrum_clock" = "1" - register "gpu_lvds_is_dual_channel" = "0" -- register "gpu_backlight" = "0x1280128" +- register "gpu_backlight" = "0x1290128" + register "gpu_backlight" = "0x879F879E" device cpu_cluster 0 on diff --git a/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/INFO b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/INFO new file mode 100644 index 0000000..4f5931f --- /dev/null +++ b/resources/libreboot/patch/coreboot/33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f/grub/x60/INFO @@ -0,0 +1,7 @@ +printf "lenovo/x60: use correct BLC_PWM_CTL value\n" +git am "../resources/libreboot/patch/misc/0003-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch" +# git fetch http://review.coreboot.org/coreboot refs/changes/24/10624/2 && git cherry-pick FETCH_HEAD + +printf "ec/lenovo/h8: permanently enable wifi/trackpoint/touchpad/bluetooth/wwan\n" +git am "../resources/libreboot/patch/misc/0005-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch" +# git fetch http://review.coreboot.org/coreboot refs/changes/58/7058/9 && git cherry-pick FETCH_HEAD diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch deleted file mode 100644 index 691c30d..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e1a421df8add1b976ee9bd001c88fbc95900e1f3 Mon Sep 17 00:00:00 2001 -From: Vladimir Serbinenko <phcoder@gmail.com> -Date: Thu, 21 Aug 2014 02:25:59 +0200 -Subject: [PATCH 13/22] lenovo/x60: Enable text mode native gfx init - -Change-Id: I3aad96a7034c73e447cf8995473a45ffd3893f3f -Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> ---- - src/mainboard/lenovo/x60/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig -index 0125d8c..ab4b58e 100644 ---- a/src/mainboard/lenovo/x60/Kconfig -+++ b/src/mainboard/lenovo/x60/Kconfig -@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select HAVE_ACPI_RESUME - select USE_OPTION_TABLE - select MAINBOARD_HAS_NATIVE_VGA_INIT -+ select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select H8_DOCK_EARLY_INIT - select DRIVERS_LENOVO_WACOM - select INTEL_EDID --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch deleted file mode 100644 index f54094a..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5a762600dd0d41c1f1f24dfccea62d9cefb5b3d6 Mon Sep 17 00:00:00 2001 -From: Vladimir Serbinenko <phcoder@gmail.com> -Date: Tue, 4 Mar 2014 18:08:26 +0100 -Subject: [PATCH 15/22] lenovo/t60: Enable native intel gfx init. - -Tested on T60 with intel graphics. - -Change-Id: Id74d0a1315749052e7313135242e6b64862aa5e1 -Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> ---- - src/mainboard/lenovo/t60/Kconfig | 3 +++ - src/mainboard/lenovo/t60/devicetree.cb | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig -index 0cf19a1..2254185 100644 ---- a/src/mainboard/lenovo/t60/Kconfig -+++ b/src/mainboard/lenovo/t60/Kconfig -@@ -20,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select CHANNEL_XOR_RANDOMIZATION - select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME -+ select MAINBOARD_HAS_NATIVE_VGA_INIT - select H8_DOCK_EARLY_INIT - select HAVE_CMOS_DEFAULT -+ select INTEL_EDID -+ - config MAINBOARD_DIR - string - default lenovo/t60 -diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb -index bca0787..a0ee7f9 100644 ---- a/src/mainboard/lenovo/t60/devicetree.cb -+++ b/src/mainboard/lenovo/t60/devicetree.cb -@@ -22,6 +22,11 @@ - - chip northbridge/intel/i945 - -+ register "gpu_hotplug" = "0x00000220" -+ register "gpu_lvds_use_spread_spectrum_clock" = "1" -+ register "gpu_lvds_is_dual_channel" = "1" -+ register "gpu_backlight" = "0x1280128" -+ - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 - device lapic 0 on end --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch deleted file mode 100644 index 6aee3ad..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 875078b081cfe58eaf755bfdd10c743b7207be0f Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Sat, 11 Oct 2014 18:41:35 +0100 -Subject: [PATCH 16/22] lenovo/t60: Enable text mode native gfx init - -Change-Id: Iffd2b1d5f86d4b872f8d39466cbbccd088ef7784 -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/t60/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig -index 2254185..52eeda3 100644 ---- a/src/mainboard/lenovo/t60/Kconfig -+++ b/src/mainboard/lenovo/t60/Kconfig -@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME - select MAINBOARD_HAS_NATIVE_VGA_INIT -+ select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select H8_DOCK_EARLY_INIT - select HAVE_CMOS_DEFAULT - select INTEL_EDID --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch deleted file mode 100644 index 7757620..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 519a5be5914a2949f93f4c2f76b22cf4e6102879 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Sat, 11 Oct 2014 20:36:10 +0100 -Subject: [PATCH 17/22] lenovo/t60: Enable legacy brightness controls (native - graphics) - -Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM). - -Change-Id: I95f634c5071f6d4bdd423819ce4e40985732761c -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/t60/devicetree.cb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb -index a0ee7f9..43f570e 100644 ---- a/src/mainboard/lenovo/t60/devicetree.cb -+++ b/src/mainboard/lenovo/t60/devicetree.cb -@@ -25,7 +25,7 @@ chip northbridge/intel/i945 - register "gpu_hotplug" = "0x00000220" - register "gpu_lvds_use_spread_spectrum_clock" = "1" - register "gpu_lvds_is_dual_channel" = "1" -- register "gpu_backlight" = "0x1280128" -+ register "gpu_backlight" = "0x58BF58BE" - - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch deleted file mode 100644 index 70bf654..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/t60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a36e204862fc556c7d06cbc9c29f6b0a4df21287 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Mon, 13 Oct 2014 00:14:53 +0100 -Subject: [PATCH 18/22] NOTFORMERGE: ec/lenovo/h8: - wlan/trackpoint/touchpad/bluetooth/wwan - -Permanently enable them. Ignore configuration made by nvramtool. -Almost every user will want all of these to be enabled, and those -who would like them to be disabled would physically remove the -relevant components from their machine anyway, or just not use -them (in the case of the touchpad or trackpoint). So, why make it -configurable in the first place? All it does is add confusion. - -The mind boggles. - -Change-Id: Ic76ab9ab9c865f30312378e18af58bece6c3260a -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/ec/lenovo/h8/h8.c | 21 +++++++++++---------- - src/ec/lenovo/pmh7/pmh7.c | 11 ++++------- - 2 files changed, 15 insertions(+), 17 deletions(-) - -diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c -index 13b0483..b688e64 100644 ---- a/src/ec/lenovo/h8/h8.c -+++ b/src/ec/lenovo/h8/h8.c -@@ -245,9 +245,11 @@ static void h8_enable(struct device *dev) - - ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO); - -- if (get_option(&val, "wlan") != CB_SUCCESS) -- val = 1; -- h8_wlan_enable(val); -+ // Permanently enable wifi -+ // Intel wifi could be a security risk because it uses firmware. Wlan chip has DMA -+ // and could leak data over a side-channel. Using another manufacturer is recommended. -+ // see http://libreboot.org/docs/index.html#recommended_wifi -+ h8_wlan_enable(1); - - h8_trackpoint_enable(1); - h8_usb_power_enable(1); -@@ -255,14 +257,13 @@ static void h8_enable(struct device *dev) - if (get_option(&val, "volume") == CB_SUCCESS) - ec_write(H8_VOLUME_CONTROL, val); - -- if (get_option(&val, "bluetooth") != CB_SUCCESS) -- val = 1; -- h8_bluetooth_enable(val); -- -- if (get_option(&val, "wwan") != CB_SUCCESS) -- val = 1; -+ // Permanently enable bluetooth. -+ // NOTE: bluetooth is a potential security risk. Physical removal of the bluetooth module is recommended. -+ h8_bluetooth_enable(1); - -- h8_wwan_enable(val); -+ // Permanently enable wwan. -+ // NOTE: wwan is a security risk (remove access plus DMA). Physical removal of both the wwan and sim card is recommended. -+ h8_wwan_enable(1); - - if (conf->has_uwb) { - if (get_option(&val, "uwb") != CB_SUCCESS) -diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c -index f67fbda..9cb7149 100644 ---- a/src/ec/lenovo/pmh7/pmh7.c -+++ b/src/ec/lenovo/pmh7/pmh7.c -@@ -106,7 +106,6 @@ static void enable_dev(struct device *dev) - { - struct ec_lenovo_pmh7_config *conf = dev->chip_info; - struct resource *resource; -- u8 val; - - resource = new_resource(dev, EC_LENOVO_PMH7_INDEX); - resource->flags = IORESOURCE_IO | IORESOURCE_FIXED; -@@ -118,13 +117,11 @@ static void enable_dev(struct device *dev) - pmh7_backlight_enable(conf->backlight_enable); - pmh7_dock_event_enable(conf->dock_event_enable); - -- if (get_option(&val, "touchpad") != CB_SUCCESS) -- val = 1; -- pmh7_touchpad_enable(val); -+ // Permanently enable touchpad -+ pmh7_touchpad_enable(1); - -- if (get_option(&val, "trackpoint") != CB_SUCCESS) -- val = 1; -- pmh7_trackpoint_enable(val); -+ // Permanently enable trackpoint -+ pmh7_trackpoint_enable(1); - } - - struct chip_operations ec_lenovo_pmh7_ops = { --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch deleted file mode 100644 index 691c30d..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0013-lenovo-x60-Enable-text-mode-native-gfx-init.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e1a421df8add1b976ee9bd001c88fbc95900e1f3 Mon Sep 17 00:00:00 2001 -From: Vladimir Serbinenko <phcoder@gmail.com> -Date: Thu, 21 Aug 2014 02:25:59 +0200 -Subject: [PATCH 13/22] lenovo/x60: Enable text mode native gfx init - -Change-Id: I3aad96a7034c73e447cf8995473a45ffd3893f3f -Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> ---- - src/mainboard/lenovo/x60/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig -index 0125d8c..ab4b58e 100644 ---- a/src/mainboard/lenovo/x60/Kconfig -+++ b/src/mainboard/lenovo/x60/Kconfig -@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select HAVE_ACPI_RESUME - select USE_OPTION_TABLE - select MAINBOARD_HAS_NATIVE_VGA_INIT -+ select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select H8_DOCK_EARLY_INIT - select DRIVERS_LENOVO_WACOM - select INTEL_EDID --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch deleted file mode 100644 index 1c5b4b3..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0014-lenovo-x60-Enable-legacy-brightness-controls-native-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 89f4c7561e486030d867674e4df2978a7260c4a7 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Sat, 11 Oct 2014 16:43:28 +0100 -Subject: [PATCH 14/22] lenovo/x60: Enable legacy brightness controls (native - graphics) - -Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM). - -Change-Id: Id855c4e91fe71fb489739e62fbe99ca22841acd2 -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/x60/devicetree.cb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb -index 382ebaf..4e02d3c 100644 ---- a/src/mainboard/lenovo/x60/devicetree.cb -+++ b/src/mainboard/lenovo/x60/devicetree.cb -@@ -25,7 +25,7 @@ chip northbridge/intel/i945 - register "gpu_hotplug" = "0x00000220" - register "gpu_lvds_use_spread_spectrum_clock" = "1" - register "gpu_lvds_is_dual_channel" = "0" -- register "gpu_backlight" = "0x1280128" -+ register "gpu_backlight" = "0x879F879E" - - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch deleted file mode 100644 index f54094a..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0015-lenovo-t60-Enable-native-intel-gfx-init.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5a762600dd0d41c1f1f24dfccea62d9cefb5b3d6 Mon Sep 17 00:00:00 2001 -From: Vladimir Serbinenko <phcoder@gmail.com> -Date: Tue, 4 Mar 2014 18:08:26 +0100 -Subject: [PATCH 15/22] lenovo/t60: Enable native intel gfx init. - -Tested on T60 with intel graphics. - -Change-Id: Id74d0a1315749052e7313135242e6b64862aa5e1 -Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> ---- - src/mainboard/lenovo/t60/Kconfig | 3 +++ - src/mainboard/lenovo/t60/devicetree.cb | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig -index 0cf19a1..2254185 100644 ---- a/src/mainboard/lenovo/t60/Kconfig -+++ b/src/mainboard/lenovo/t60/Kconfig -@@ -20,8 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select CHANNEL_XOR_RANDOMIZATION - select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME -+ select MAINBOARD_HAS_NATIVE_VGA_INIT - select H8_DOCK_EARLY_INIT - select HAVE_CMOS_DEFAULT -+ select INTEL_EDID -+ - config MAINBOARD_DIR - string - default lenovo/t60 -diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb -index bca0787..a0ee7f9 100644 ---- a/src/mainboard/lenovo/t60/devicetree.cb -+++ b/src/mainboard/lenovo/t60/devicetree.cb -@@ -22,6 +22,11 @@ - - chip northbridge/intel/i945 - -+ register "gpu_hotplug" = "0x00000220" -+ register "gpu_lvds_use_spread_spectrum_clock" = "1" -+ register "gpu_lvds_is_dual_channel" = "1" -+ register "gpu_backlight" = "0x1280128" -+ - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 - device lapic 0 on end --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch deleted file mode 100644 index 6aee3ad..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0016-lenovo-t60-Enable-text-mode-native-gfx-init.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 875078b081cfe58eaf755bfdd10c743b7207be0f Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Sat, 11 Oct 2014 18:41:35 +0100 -Subject: [PATCH 16/22] lenovo/t60: Enable text mode native gfx init - -Change-Id: Iffd2b1d5f86d4b872f8d39466cbbccd088ef7784 -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/t60/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig -index 2254185..52eeda3 100644 ---- a/src/mainboard/lenovo/t60/Kconfig -+++ b/src/mainboard/lenovo/t60/Kconfig -@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy - select HAVE_ACPI_TABLES - select HAVE_ACPI_RESUME - select MAINBOARD_HAS_NATIVE_VGA_INIT -+ select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG - select H8_DOCK_EARLY_INIT - select HAVE_CMOS_DEFAULT - select INTEL_EDID --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch deleted file mode 100644 index 7757620..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0017-lenovo-t60-Enable-legacy-brightness-controls-native-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 519a5be5914a2949f93f4c2f76b22cf4e6102879 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Sat, 11 Oct 2014 20:36:10 +0100 -Subject: [PATCH 17/22] lenovo/t60: Enable legacy brightness controls (native - graphics) - -Value obtained by reading BLC_PWM_CTL when running the VBIOS (option ROM). - -Change-Id: I95f634c5071f6d4bdd423819ce4e40985732761c -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/mainboard/lenovo/t60/devicetree.cb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb -index a0ee7f9..43f570e 100644 ---- a/src/mainboard/lenovo/t60/devicetree.cb -+++ b/src/mainboard/lenovo/t60/devicetree.cb -@@ -25,7 +25,7 @@ chip northbridge/intel/i945 - register "gpu_hotplug" = "0x00000220" - register "gpu_lvds_use_spread_spectrum_clock" = "1" - register "gpu_lvds_is_dual_channel" = "1" -- register "gpu_backlight" = "0x1280128" -+ register "gpu_backlight" = "0x58BF58BE" - - device cpu_cluster 0 on - chip cpu/intel/socket_mFCPGA478 --- -1.9.1 - diff --git a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch deleted file mode 100644 index 70bf654..0000000 --- a/resources/libreboot/patch/coreboot/e19c8b0091022ae3f490601aed0c290cd5171b79/x60/0018-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a36e204862fc556c7d06cbc9c29f6b0a4df21287 Mon Sep 17 00:00:00 2001 -From: Francis Rowe <info@gluglug.org.uk> -Date: Mon, 13 Oct 2014 00:14:53 +0100 -Subject: [PATCH 18/22] NOTFORMERGE: ec/lenovo/h8: - wlan/trackpoint/touchpad/bluetooth/wwan - -Permanently enable them. Ignore configuration made by nvramtool. -Almost every user will want all of these to be enabled, and those -who would like them to be disabled would physically remove the -relevant components from their machine anyway, or just not use -them (in the case of the touchpad or trackpoint). So, why make it -configurable in the first place? All it does is add confusion. - -The mind boggles. - -Change-Id: Ic76ab9ab9c865f30312378e18af58bece6c3260a -Signed-off-by: Francis Rowe <info@gluglug.org.uk> ---- - src/ec/lenovo/h8/h8.c | 21 +++++++++++---------- - src/ec/lenovo/pmh7/pmh7.c | 11 ++++------- - 2 files changed, 15 insertions(+), 17 deletions(-) - -diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c -index 13b0483..b688e64 100644 ---- a/src/ec/lenovo/h8/h8.c -+++ b/src/ec/lenovo/h8/h8.c -@@ -245,9 +245,11 @@ static void h8_enable(struct device *dev) - - ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO); - -- if (get_option(&val, "wlan") != CB_SUCCESS) -- val = 1; -- h8_wlan_enable(val); -+ // Permanently enable wifi -+ // Intel wifi could be a security risk because it uses firmware. Wlan chip has DMA -+ // and could leak data over a side-channel. Using another manufacturer is recommended. -+ // see http://libreboot.org/docs/index.html#recommended_wifi -+ h8_wlan_enable(1); - - h8_trackpoint_enable(1); - h8_usb_power_enable(1); -@@ -255,14 +257,13 @@ static void h8_enable(struct device *dev) - if (get_option(&val, "volume") == CB_SUCCESS) - ec_write(H8_VOLUME_CONTROL, val); - -- if (get_option(&val, "bluetooth") != CB_SUCCESS) -- val = 1; -- h8_bluetooth_enable(val); -- -- if (get_option(&val, "wwan") != CB_SUCCESS) -- val = 1; -+ // Permanently enable bluetooth. -+ // NOTE: bluetooth is a potential security risk. Physical removal of the bluetooth module is recommended. -+ h8_bluetooth_enable(1); - -- h8_wwan_enable(val); -+ // Permanently enable wwan. -+ // NOTE: wwan is a security risk (remove access plus DMA). Physical removal of both the wwan and sim card is recommended. -+ h8_wwan_enable(1); - - if (conf->has_uwb) { - if (get_option(&val, "uwb") != CB_SUCCESS) -diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c -index f67fbda..9cb7149 100644 ---- a/src/ec/lenovo/pmh7/pmh7.c -+++ b/src/ec/lenovo/pmh7/pmh7.c -@@ -106,7 +106,6 @@ static void enable_dev(struct device *dev) - { - struct ec_lenovo_pmh7_config *conf = dev->chip_info; - struct resource *resource; -- u8 val; - - resource = new_resource(dev, EC_LENOVO_PMH7_INDEX); - resource->flags = IORESOURCE_IO | IORESOURCE_FIXED; -@@ -118,13 +117,11 @@ static void enable_dev(struct device *dev) - pmh7_backlight_enable(conf->backlight_enable); - pmh7_dock_event_enable(conf->dock_event_enable); - -- if (get_option(&val, "touchpad") != CB_SUCCESS) -- val = 1; -- pmh7_touchpad_enable(val); -+ // Permanently enable touchpad -+ pmh7_touchpad_enable(1); - -- if (get_option(&val, "trackpoint") != CB_SUCCESS) -- val = 1; -- pmh7_trackpoint_enable(val); -+ // Permanently enable trackpoint -+ pmh7_trackpoint_enable(1); - } - - struct chip_operations ec_lenovo_pmh7_ops = { --- -1.9.1 - |