aboutsummaryrefslogtreecommitdiff
path: root/resources/libreboot
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libreboot')
-rw-r--r--resources/libreboot/config/grub/kfsn4-dre/config145
-rw-r--r--resources/libreboot/config/grub/macbook21/config142
-rw-r--r--resources/libreboot/config/grub/qemu_i440fx_piix4/config136
-rw-r--r--resources/libreboot/config/grub/qemu_q35_ich9/config134
-rw-r--r--resources/libreboot/config/grub/r400_4mb/config144
-rw-r--r--resources/libreboot/config/grub/r400_8mb/config144
-rw-r--r--resources/libreboot/config/grub/t400_4mb/config144
-rw-r--r--resources/libreboot/config/grub/t400_8mb/config144
-rw-r--r--resources/libreboot/config/grub/t500_4mb/config144
-rw-r--r--resources/libreboot/config/grub/t500_8mb/config144
-rw-r--r--resources/libreboot/config/grub/t60/config141
-rw-r--r--resources/libreboot/config/grub/x200_4mb/config142
-rw-r--r--resources/libreboot/config/grub/x200_8mb/config142
-rw-r--r--resources/libreboot/config/grub/x60/config141
-rw-r--r--resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch4
-rw-r--r--resources/libreboot/patch/0002-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch (renamed from resources/libreboot/patch/0003-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch)4
-rw-r--r--resources/libreboot/patch/0002-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch27
-rw-r--r--resources/libreboot/patch/0003-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch (renamed from resources/libreboot/patch/0004-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch)4
-rw-r--r--resources/libreboot/patch/0004-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch (renamed from resources/libreboot/patch/0006-lenovo-x60-Enable-brightness-controls-native-graphic.patch)24
-rw-r--r--resources/libreboot/patch/0005-lenovo-t60-Enable-native-intel-gfx-init.patch (renamed from resources/libreboot/patch/0007-lenovo-t60-Enable-native-intel-gfx-init.patch)4
-rw-r--r--resources/libreboot/patch/0005-lenovo-x60-Enable-VESA-framebuffer-mode-native-graph.patch31
-rw-r--r--resources/libreboot/patch/0006-lenovo-t60-Enable-VESA-framebuffer-mode-native-graph.patch (renamed from resources/libreboot/patch/0008-lenovo-t60-Enable-VESA-framebuffer-mode-native-graph.patch)4
-rw-r--r--resources/libreboot/patch/0007-lenovo-t60-Enable-brightness-controls-native-graphic.patch (renamed from resources/libreboot/patch/0009-lenovo-t60-Enable-brightness-controls-native-graphic.patch)4
-rw-r--r--resources/libreboot/patch/0008-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch (renamed from resources/libreboot/patch/0010-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch)10
-rw-r--r--resources/libreboot/patch/0009-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch (renamed from resources/libreboot/patch/0011-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch)5
-rw-r--r--resources/libreboot/patch/0010-gm45-fix-uneven-backlight-native-gfx-init.patch (renamed from resources/libreboot/patch/0012-gm45-fix-uneven-backlight-native-gfx-init.patch)4
-rw-r--r--resources/libreboot/patch/0011-lenovo-r400-Add-clone-of-Lenovo-T400.patch (renamed from resources/libreboot/patch/0013-lenovo-r400-Add-clone-of-Lenovo-T400.patch)8
-rw-r--r--resources/libreboot/patch/0012-lenovo-t500-Add-clone-of-Lenovo-T400.patch (renamed from resources/libreboot/patch/0014-lenovo-t500-Add-clone-of-Lenovo-T400.patch)6
-rw-r--r--resources/libreboot/patch/0013-ec-lenovo-h8-re-factor-handling-of-power_management_.patch (renamed from resources/libreboot/patch/0015-ec-lenovo-h8-re-factor-handling-of-power_management_.patch)6
-rw-r--r--resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch29
30 files changed, 994 insertions, 1167 deletions
diff --git a/resources/libreboot/config/grub/kfsn4-dre/config b/resources/libreboot/config/grub/kfsn4-dre/config
index 6902f78f..42231cb5 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/config
+++ b/resources/libreboot/config/grub/kfsn4-dre/config
@@ -123,9 +123,6 @@ CONFIG_ONBOARD_VGA_IS_PRIMARY=y
# CONFIG_VGA_BIOS is not set
# CONFIG_UDELAY_IO is not set
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_RAMTOP=0x400000
-CONFIG_HEAP_SIZE=0xc0000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xc4000
CONFIG_DCACHE_RAM_SIZE=0x0c000
CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
@@ -162,6 +159,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x400000
CONFIG_USBDEBUG_HCD_INDEX=0
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -169,7 +167,6 @@ CONFIG_CBFS_SIZE=0x100000
CONFIG_UDELAY_LAPIC_FIXED_FSB=200
CONFIG_POST_IO=y
CONFIG_POST_DEVICE=y
-CONFIG_SEABIOS_PS2_TIMEOUT=0
CONFIG_CPU_ADDR_BITS=48
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -189,67 +186,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_1024=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=1024
CONFIG_ROM_SIZE=0x100000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/amd/amdfam10/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/nvidia/ck804/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
# CONFIG_SYSTEM_TYPE_LAPTOP is not set
#
@@ -260,12 +196,15 @@ CONFIG_HPET_ADDRESS=0xfed00000
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/nvidia/ck804/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+CONFIG_HEAP_SIZE=0xc0000
# 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
@@ -276,6 +215,9 @@ CONFIG_EHCI_BAR=0xfef00000
# CPU
#
# CONFIG_CPU_ALLWINNER_A10 is not set
+CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
+CONFIG_DCACHE_BSP_STACK_SLUSH=0x1000
+CONFIG_DCACHE_AP_STACK_SIZE=0x400
CONFIG_CPU_SOCKET_TYPE=0x10
# CONFIG_EXT_RT_TBL_SUPPORT is not set
CONFIG_CBB=0x0
@@ -289,6 +231,7 @@ CONFIG_SET_FIDVID_DEBUG=y
# CONFIG_SET_FIDVID_CORE0_ONLY is not set
CONFIG_SET_FIDVID_STORE_AP_APICID_AT_FIRST=y
CONFIG_CPU_AMD_MODEL_10XXX=y
+CONFIG_NUM_IPI_STARTS=1
CONFIG_SET_FIDVID_CORE_RANGE=0
# CONFIG_CPU_AMD_AGESA is not set
# CONFIG_CPU_AMD_PI is not set
@@ -346,6 +289,8 @@ CONFIG_LIMIT_HT_UP_WIDTH_16=y
# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
CONFIG_VIDEO_MB=0
# CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_RAMBASE=0x100000
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0xfa
CONFIG_MAX_PIRQ_LINKS=4
@@ -371,6 +316,64 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
#
# Embedded Controllers
#
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -411,10 +414,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_I2C_W83793=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
# CONFIG_INTEL_EDID is not set
@@ -527,13 +526,11 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KFSN4-DRE"
#
# 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
diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config
index caf5e7a4..32b50e1b 100644
--- a/resources/libreboot/config/grub/macbook21/config
+++ b/resources/libreboot/config/grub/macbook21/config
@@ -117,9 +117,6 @@ CONFIG_VGA_BIOS_ID="8086,27a2"
# CONFIG_VGA_BIOS is not set
# CONFIG_UDELAY_IO is not set
CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX"
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffdf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
# CONFIG_BOARD_APPLE_MACBOOK11 is not set
@@ -129,13 +126,13 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=0
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
CONFIG_CBFS_SIZE=0x200000
CONFIG_POST_IO=y
CONFIG_POST_DEVICE=y
-CONFIG_SEABIOS_PS2_TIMEOUT=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -155,67 +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_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_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_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_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -226,12 +162,15 @@ 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_SOC_INTEL_COMMON_RESET is not set
+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
@@ -244,6 +183,7 @@ CONFIG_EHCI_BAR=0xfef00000
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -287,6 +227,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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
@@ -294,6 +235,7 @@ 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
@@ -315,6 +257,64 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
# Embedded Controllers
#
CONFIG_EC_ACPI=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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
@@ -354,10 +354,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_GIC is not set
# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
# CONFIG_DRIVERS_I2C_RTD2132 is not set
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -466,13 +462,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
diff --git a/resources/libreboot/config/grub/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
index a456d19f..66093416 100644
--- a/resources/libreboot/config/grub/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
@@ -116,9 +116,6 @@ CONFIG_MAX_CPUS=1
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xd0000
CONFIG_DCACHE_RAM_SIZE=0x10000
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
@@ -130,12 +127,12 @@ CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
CONFIG_BOARD_EMULATION_QEMU_X86=y
+CONFIG_RAMTOP=0x200000
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
CONFIG_CBFS_SIZE=0x800000
CONFIG_POST_IO=y
CONFIG_POST_DEVICE=y
-CONFIG_SEABIOS_PS2_TIMEOUT=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_MAINBOARD_VERSION="1.0"
@@ -153,64 +150,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=8192
CONFIG_ROM_SIZE=0x800000
-# 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_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_SIPI_VECTOR_IN_ROM is not set
-CONFIG_NUM_IPI_STARTS=2
-# CONFIG_ROMCC is not set
-# CONFIG_LATE_CBMEM_INIT is not set
-CONFIG_PC80_SYSTEM=y
-# CONFIG_HAVE_CMOS_DEFAULT is not set
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82371eb/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
# CONFIG_SYSTEM_TYPE_LAPTOP is not set
#
@@ -221,11 +160,13 @@ CONFIG_HPET_ADDRESS=0xfed00000
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82371eb/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -237,6 +178,7 @@ CONFIG_TTYS0_BASE=0x3f8
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -275,6 +217,8 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
CONFIG_VIDEO_MB=0
# CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_RAMBASE=0x100000
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_MAX_PIRQ_LINKS=4
#
@@ -294,6 +238,62 @@ CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
#
# Embedded Controllers
#
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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_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 is not set
+CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
+# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
+# CONFIG_COMPILE_IN_DSDT is not set
#
# Devices
@@ -335,10 +335,6 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
# CONFIG_GIC is not set
# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
# CONFIG_DRIVERS_I2C_RTD2132 is not set
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
# CONFIG_INTEL_EDID is not set
@@ -439,13 +435,11 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 i440fx/piix4"
#
# 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
diff --git a/resources/libreboot/config/grub/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config
index dcdc0670..e96a704c 100644
--- a/resources/libreboot/config/grub/qemu_q35_ich9/config
+++ b/resources/libreboot/config/grub/qemu_q35_ich9/config
@@ -114,9 +114,6 @@ CONFIG_MAX_CPUS=1
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xd0000
CONFIG_DCACHE_RAM_SIZE=0x10000
CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
@@ -130,12 +127,12 @@ CONFIG_ID_SECTION_OFFSET=0x80
CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
CONFIG_BOARD_EMULATION_QEMU_X86=y
+CONFIG_RAMTOP=0x200000
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
CONFIG_CBFS_SIZE=0x800000
CONFIG_POST_IO=y
CONFIG_POST_DEVICE=y
-CONFIG_SEABIOS_PS2_TIMEOUT=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
# CONFIG_USBDEBUG is not set
@@ -154,63 +151,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=8192
CONFIG_ROM_SIZE=0x800000
-# 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_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_SIPI_VECTOR_IN_ROM is not set
-CONFIG_NUM_IPI_STARTS=2
-# CONFIG_ROMCC is not set
-# CONFIG_LATE_CBMEM_INIT is not set
-CONFIG_PC80_SYSTEM=y
-# CONFIG_HAVE_CMOS_DEFAULT is not set
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
# CONFIG_SYSTEM_TYPE_LAPTOP is not set
#
@@ -221,12 +161,14 @@ CONFIG_HPET_ADDRESS=0xfed00000
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -238,6 +180,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -276,6 +219,8 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
CONFIG_VIDEO_MB=0
# CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_RAMBASE=0x100000
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -296,6 +241,61 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
#
# Embedded Controllers
#
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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_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 is not set
+CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
+# CONFIG_COMPILE_IN_DSDT is not set
#
# Devices
@@ -338,10 +338,6 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
# CONFIG_GIC is not set
# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
# CONFIG_DRIVERS_I2C_RTD2132 is not set
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
# CONFIG_INTEL_EDID is not set
@@ -441,13 +437,11 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
#
# 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
diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config
index 91dafe9b..54489f34 100644
--- a/resources/libreboot/config/grub/r400_4mb/config
+++ b/resources/libreboot/config/grub/r400_4mb/config
@@ -116,15 +116,13 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -145,7 +143,6 @@ CONFIG_BOARD_LENOVO_R400=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -164,67 +161,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=4096
CONFIG_ROM_SIZE=0x400000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -235,12 +171,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -252,6 +191,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -293,8 +233,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -319,6 +261,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -360,10 +360,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -384,7 +380,7 @@ CONFIG_DRIVERS_MC146818=y
# 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_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_8250MEM is not set
# CONFIG_HAVE_UART_SPECIAL is not set
# CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -469,13 +465,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config
index 905a9971..a36f2d36 100644
--- a/resources/libreboot/config/grub/r400_8mb/config
+++ b/resources/libreboot/config/grub/r400_8mb/config
@@ -116,15 +116,13 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -145,7 +143,6 @@ CONFIG_BOARD_LENOVO_R400=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -164,67 +161,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=8192
CONFIG_ROM_SIZE=0x800000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -235,12 +171,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -252,6 +191,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -293,8 +233,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -319,6 +261,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -360,10 +360,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -384,7 +380,7 @@ CONFIG_DRIVERS_MC146818=y
# 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_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_8250MEM is not set
# CONFIG_HAVE_UART_SPECIAL is not set
# CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -469,13 +465,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config
index 5ae564a8..7d2e07d5 100644
--- a/resources/libreboot/config/grub/t400_4mb/config
+++ b/resources/libreboot/config/grub/t400_4mb/config
@@ -116,15 +116,13 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -145,7 +143,6 @@ CONFIG_BOARD_LENOVO_T400=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -164,67 +161,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=4096
CONFIG_ROM_SIZE=0x400000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -235,12 +171,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -252,6 +191,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -293,8 +233,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -319,6 +261,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -360,10 +360,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -384,7 +380,7 @@ CONFIG_DRIVERS_MC146818=y
# 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_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_8250MEM is not set
# CONFIG_HAVE_UART_SPECIAL is not set
# CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -469,13 +465,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config
index 8fbf5835..0c4b7f9e 100644
--- a/resources/libreboot/config/grub/t400_8mb/config
+++ b/resources/libreboot/config/grub/t400_8mb/config
@@ -116,15 +116,13 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -145,7 +143,6 @@ CONFIG_BOARD_LENOVO_T400=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -164,67 +161,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=8192
CONFIG_ROM_SIZE=0x800000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -235,12 +171,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -252,6 +191,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -293,8 +233,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -319,6 +261,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -360,10 +360,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -384,7 +380,7 @@ CONFIG_DRIVERS_MC146818=y
# 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_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_8250MEM is not set
# CONFIG_HAVE_UART_SPECIAL is not set
# CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -469,13 +465,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config
index e864cac4..a49d64e3 100644
--- a/resources/libreboot/config/grub/t500_4mb/config
+++ b/resources/libreboot/config/grub/t500_4mb/config
@@ -116,15 +116,13 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -145,7 +143,6 @@ CONFIG_BOARD_LENOVO_T500=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -164,67 +161,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=4096
CONFIG_ROM_SIZE=0x400000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -235,12 +171,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -252,6 +191,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -293,8 +233,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -319,6 +261,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -360,10 +360,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -384,7 +380,7 @@ CONFIG_DRIVERS_MC146818=y
# 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_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_8250MEM is not set
# CONFIG_HAVE_UART_SPECIAL is not set
# CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -469,13 +465,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config
index a21072e4..51658927 100644
--- a/resources/libreboot/config/grub/t500_8mb/config
+++ b/resources/libreboot/config/grub/t500_8mb/config
@@ -116,15 +116,13 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -145,7 +143,6 @@ CONFIG_BOARD_LENOVO_T500=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -164,67 +161,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=8192
CONFIG_ROM_SIZE=0x800000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -235,12 +171,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_TTYS0_BASE=0x3f8
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -252,6 +191,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -293,8 +233,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -319,6 +261,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -360,10 +360,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -384,7 +380,7 @@ CONFIG_DRIVERS_MC146818=y
# 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_NO_UART_ON_SUPERIO=y
# CONFIG_DRIVERS_UART_8250MEM is not set
# CONFIG_HAVE_UART_SPECIAL is not set
# CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -469,13 +465,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config
index 8d23cd5f..64e0efc0 100644
--- a/resources/libreboot/config/grub/t60/config
+++ b/resources/libreboot/config/grub/t60/config
@@ -116,15 +116,13 @@ 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_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffdf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=0
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -164,67 +162,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_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_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_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_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -235,12 +172,15 @@ 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_SOC_INTEL_COMMON_RESET is not set
+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
@@ -253,6 +193,7 @@ CONFIG_EHCI_BAR=0xfef00000
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -296,6 +237,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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
@@ -303,6 +245,7 @@ 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
@@ -330,6 +273,64 @@ CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_DOCK_EARLY_INIT=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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
@@ -370,10 +371,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -481,13 +478,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config
index 95056e55..6b33ff7b 100644
--- a/resources/libreboot/config/grub/x200_4mb/config
+++ b/resources/libreboot/config/grub/x200_4mb/config
@@ -116,14 +116,12 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
CONFIG_CBFS_SIZE=0x3FD000
@@ -143,7 +141,6 @@ CONFIG_BOARD_LENOVO_X200=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -162,67 +159,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=4096
CONFIG_ROM_SIZE=0x400000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -233,11 +169,14 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -249,6 +188,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -290,8 +230,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -316,6 +258,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -357,10 +357,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -459,13 +455,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config
index de42e491..f0f65dcb 100644
--- a/resources/libreboot/config/grub/x200_8mb/config
+++ b/resources/libreboot/config/grub/x200_8mb/config
@@ -116,14 +116,12 @@ CONFIG_VGA_BIOS_ID="8086,2a42"
# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
# CONFIG_VGA_BIOS is not set
CONFIG_UDELAY_IO=y
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffaf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
CONFIG_CBFS_SIZE=0x7FD000
@@ -143,7 +141,6 @@ CONFIG_BOARD_LENOVO_X200=y
# 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=0
CONFIG_CPU_ADDR_BITS=36
CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
CONFIG_USBDEBUG=y
@@ -162,67 +159,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
CONFIG_COREBOOT_ROMSIZE_KB=8192
CONFIG_ROM_SIZE=0x800000
-# 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_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 is not set
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
-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/gm45/bootblock.c"
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -233,11 +169,14 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
# SoC
#
# CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
+CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+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
@@ -249,6 +188,7 @@ CONFIG_EHCI_BAR=0xfef00000
#
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -290,8 +230,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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_GM45=y
+CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_HPET_MIN_TICKS=0x80
CONFIG_MAX_PIRQ_LINKS=4
@@ -316,6 +258,64 @@ CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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 is not set
+# 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
@@ -357,10 +357,6 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -459,13 +455,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index 8cfe35bf..5e6d70d5 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -117,15 +117,13 @@ 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_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
CONFIG_DCACHE_RAM_BASE=0xffdf8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_UART_FOR_CONSOLE=0
CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_RAMTOP=0x200000
CONFIG_USBDEBUG_HCD_INDEX=0
CONFIG_TTYS0_LCS=3
CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
@@ -165,67 +163,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_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_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_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_MAINBOARD_HAS_CHROMEOS is not set
CONFIG_SYSTEM_TYPE_LAPTOP=y
#
@@ -236,12 +173,15 @@ 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_SOC_INTEL_COMMON_RESET is not set
+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
@@ -254,6 +194,7 @@ CONFIG_EHCI_BAR=0xfef00000
# CONFIG_CPU_ALLWINNER_A10 is not set
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_XIP_ROM_SIZE=0x10000
+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
@@ -297,6 +238,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
# 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
@@ -304,6 +246,7 @@ 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
@@ -331,6 +274,64 @@ CONFIG_EC_ACPI=y
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_DOCK_EARLY_INIT=y
CONFIG_EC_LENOVO_PMH7=y
+# CONFIG_MAINBOARD_HAS_CHROMEOS 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_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
@@ -371,10 +372,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
# CONFIG_DRIVERS_I2C_RTD2132 is not set
CONFIG_DRIVERS_ICS_954309=y
-
-#
-# Intel FSP
-#
# CONFIG_INTEL_DP is not set
# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
@@ -486,13 +483,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
#
# 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
diff --git a/resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch b/resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch
index fd0b8eb7..cf6668ff 100644
--- a/resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch
+++ b/resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch
@@ -1,7 +1,7 @@
-From 29a398fd71efa8ca63a98125ec4e5c1de96bcb85 Mon Sep 17 00:00:00 2001
+From 60b17a1eee72342ff226761caea2501960d44a30 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <tpearson@raptorengineeringinc.com>
Date: Tue, 7 Apr 2015 13:45:06 -0500
-Subject: [PATCH 01/17] southbridge/intel/common/spi: Add Flash lockdown option
+Subject: [PATCH 01/13] southbridge/intel/common/spi: Add Flash lockdown option
Under certain circumstances it is desirable to prevent
software from altering the contents of the Flash device.
diff --git a/resources/libreboot/patch/0003-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch b/resources/libreboot/patch/0002-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
index ad753199..b31532ce 100644
--- a/resources/libreboot/patch/0003-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
+++ b/resources/libreboot/patch/0002-mainboard-lenovo-t400-Add-initial-hybrid-graphics-su.patch
@@ -1,7 +1,7 @@
-From bbf3462e7442c2cae568e147d3f0eb1195f86991 Mon Sep 17 00:00:00 2001
+From 26cfb399e15e9e2afa311bcd7774926a07c545c1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <tpearson@raptorengineeringinc.com>
Date: Sun, 5 Apr 2015 18:10:09 -0500
-Subject: [PATCH 03/17] mainboard/lenovo/t400: Add initial hybrid graphics
+Subject: [PATCH 02/13] mainboard/lenovo/t400: Add initial hybrid graphics
support
TEST: Booted T400 with Intel/ATI hybrid graphics in integrated
diff --git a/resources/libreboot/patch/0002-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch b/resources/libreboot/patch/0002-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch
deleted file mode 100644
index d0030a98..00000000
--- a/resources/libreboot/patch/0002-mainboards-lenovo-t400-Enable-serial-debug-option-fo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From afd81dfadb70b6b4357fab2842b0ac62e48623a1 Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <tpearson@raptorengineeringinc.com>
-Date: Sun, 5 Apr 2015 17:58:01 -0500
-Subject: [PATCH 02/17] mainboards/lenovo/t400: Enable serial debug option for
- use with dock
-
-Change-Id: I93fcc8147586c7ca32d4805579f4185cad3d61db
-Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
----
- src/mainboard/lenovo/t400/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
-index e410f20..a1d0652 100644
---- a/src/mainboard/lenovo/t400/Kconfig
-+++ b/src/mainboard/lenovo/t400/Kconfig
-@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
- select SOUTHBRIDGE_INTEL_I82801IX
- select EC_LENOVO_PMH7
- select EC_LENOVO_H8
-- select NO_UART_ON_SUPERIO
- select DRIVERS_ICS_954309
- select BOARD_ROMSIZE_KB_8192
- select DRIVERS_GENERIC_IOAPIC
---
-1.9.1
-
diff --git a/resources/libreboot/patch/0004-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch b/resources/libreboot/patch/0003-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
index bd5cf691..a50e790a 100644
--- a/resources/libreboot/patch/0004-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
+++ b/resources/libreboot/patch/0003-NOTFORMERGE-lenovo-t400-hard-code-enable-integrated-.patch
@@ -1,7 +1,7 @@
-From 959c74de0ecd066c9d241b784aa280dadc43bb1e Mon Sep 17 00:00:00 2001
+From dad7e30fcaf87af2d51232896b2cabc59bba4a88 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 15 Jun 2015 03:44:15 +0100
-Subject: [PATCH 04/17] NOTFORMERGE: lenovo/t400: hard-code enable
+Subject: [PATCH 03/13] NOTFORMERGE: lenovo/t400: hard-code enable
integrated-only video
Written with libreboot in mind. Libreboot uses native graphics
diff --git a/resources/libreboot/patch/0006-lenovo-x60-Enable-brightness-controls-native-graphic.patch b/resources/libreboot/patch/0004-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch
index 8e034712..7f0d29a9 100644
--- a/resources/libreboot/patch/0006-lenovo-x60-Enable-brightness-controls-native-graphic.patch
+++ b/resources/libreboot/patch/0004-lenovo-x60-use-correct-BLC_PWM_CTL-value.patch
@@ -1,33 +1,27 @@
-From 30b0666a7d2b0d8265433cb308ed1bbbabd10674 Mon Sep 17 00:00:00 2001
+From c18e0e855487069dd2c836d9a48b1e63fb7d47d3 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 06/17] lenovo/x60: Enable brightness controls (native
- graphics)
+Date: Mon, 22 Jun 2015 17:37:06 +0100
+Subject: [PATCH 04/13] lenovo/x60: use correct BLC_PWM_CTL value
-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).
+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.
-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: 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 a3d31a6..9c3c524 100644
+index b20dde5..9c3c524 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -27,7 +27,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/0007-lenovo-t60-Enable-native-intel-gfx-init.patch b/resources/libreboot/patch/0005-lenovo-t60-Enable-native-intel-gfx-init.patch
index 0c209e0f..f3f04bd2 100644
--- a/resources/libreboot/patch/0007-lenovo-t60-Enable-native-intel-gfx-init.patch
+++ b/resources/libreboot/patch/0005-lenovo-t60-Enable-native-intel-gfx-init.patch
@@ -1,7 +1,7 @@
-From 64106428f6739ed87392f59993f3e0f1a3f045c8 Mon Sep 17 00:00:00 2001
+From 4c337212bd77ab456f018d05b69bd8d0ef5d7761 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Tue, 4 Mar 2014 18:08:26 +0100
-Subject: [PATCH 07/17] lenovo/t60: Enable native intel gfx init.
+Subject: [PATCH 05/13] lenovo/t60: Enable native intel gfx init.
Tested on T60 with intel graphics.
diff --git a/resources/libreboot/patch/0005-lenovo-x60-Enable-VESA-framebuffer-mode-native-graph.patch b/resources/libreboot/patch/0005-lenovo-x60-Enable-VESA-framebuffer-mode-native-graph.patch
deleted file mode 100644
index 046a7755..00000000
--- a/resources/libreboot/patch/0005-lenovo-x60-Enable-VESA-framebuffer-mode-native-graph.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 35dbc64845f9624f6629f400dbd4b6d502baf398 Mon Sep 17 00:00:00 2001
-From: Francis Rowe <info@gluglug.org.uk>
-Date: Mon, 15 Jun 2015 20:08:06 +0100
-Subject: [PATCH 05/17] lenovo/x60: Enable VESA framebuffer mode (native
- graphics)
-
-At present, no option exists for "Keep VESA framebuffer", which
-means that text-mode will be used. Add the appropriate Kconfig
-option.
-
-Change-Id: Iaed07eba6d9288c857f7e7a0b0be1107071e49e5
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
----
- 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/0008-lenovo-t60-Enable-VESA-framebuffer-mode-native-graph.patch b/resources/libreboot/patch/0006-lenovo-t60-Enable-VESA-framebuffer-mode-native-graph.patch
index 729b09d4..10bf558b 100644
--- a/resources/libreboot/patch/0008-lenovo-t60-Enable-VESA-framebuffer-mode-native-graph.patch
+++ b/resources/libreboot/patch/0006-lenovo-t60-Enable-VESA-framebuffer-mode-native-graph.patch
@@ -1,7 +1,7 @@
-From c37e4a312e8c18b3b1e2fb11bb1cf8bb5b4aa9d2 Mon Sep 17 00:00:00 2001
+From 1623f381e7c5b8329d035d666d5498a75e81d635 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 15 Jun 2015 19:56:29 +0100
-Subject: [PATCH 08/17] lenovo/t60: Enable VESA framebuffer mode (native
+Subject: [PATCH 06/13] lenovo/t60: Enable VESA framebuffer mode (native
graphics)
At present, no option exists for "Keep VESA framebuffer", which
diff --git a/resources/libreboot/patch/0009-lenovo-t60-Enable-brightness-controls-native-graphic.patch b/resources/libreboot/patch/0007-lenovo-t60-Enable-brightness-controls-native-graphic.patch
index 7e381e25..1ee8fc3e 100644
--- a/resources/libreboot/patch/0009-lenovo-t60-Enable-brightness-controls-native-graphic.patch
+++ b/resources/libreboot/patch/0007-lenovo-t60-Enable-brightness-controls-native-graphic.patch
@@ -1,7 +1,7 @@
-From e226918085e01a51916357b4c8d667e31e040fe4 Mon Sep 17 00:00:00 2001
+From 172b2fad7663f3c52cd8830cf064234b0ae53575 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 09/17] lenovo/t60: Enable brightness controls (native
+Subject: [PATCH 07/13] lenovo/t60: Enable brightness controls (native
graphics)
This makes the Fn Home/End keys work for controlling the
diff --git a/resources/libreboot/patch/0010-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch b/resources/libreboot/patch/0008-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
index f84d0484..75934220 100644
--- a/resources/libreboot/patch/0010-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
+++ b/resources/libreboot/patch/0008-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch
@@ -1,7 +1,7 @@
-From 7786aea5d38e6e132a259c2a00cf75f493fc12fd Mon Sep 17 00:00:00 2001
+From 49c5977adafea4b0953e1fc7e9e830353273b76e 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 10/17] NOTFORMERGE: ec/lenovo/h8:
+Subject: [PATCH 08/13] NOTFORMERGE: ec/lenovo/h8:
wlan/trackpoint/touchpad/bluetooth/wwan
Permanently enable them.
@@ -14,10 +14,10 @@ Signed-off-by: Francis Rowe <info@gluglug.org.uk>
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
-index 46480f4..b6bc406 100644
+index 2cafc88..a6cb6b6 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
-@@ -252,9 +252,11 @@ static void h8_enable(struct device *dev)
+@@ -255,9 +255,11 @@ static void h8_enable(struct device *dev)
ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO);
@@ -32,7 +32,7 @@ index 46480f4..b6bc406 100644
h8_trackpoint_enable(1);
h8_usb_power_enable(1);
-@@ -262,14 +264,13 @@ static void h8_enable(struct device *dev)
+@@ -265,14 +267,13 @@ static void h8_enable(struct device *dev)
if (get_option(&val, "volume") == CB_SUCCESS)
ec_write(H8_VOLUME_CONTROL, val);
diff --git a/resources/libreboot/patch/0011-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch b/resources/libreboot/patch/0009-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch
index d41363f3..519132dc 100644
--- a/resources/libreboot/patch/0011-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch
+++ b/resources/libreboot/patch/0009-northbridge-gm45-raminit.c-enable-GS45-high-performa.patch
@@ -1,8 +1,7 @@
-From 3b67763d6029ce954cea0dbc02ff6814b7c02478 Mon Sep 17 00:00:00 2001
+From a59b0e652911627cb00b748bb71f07ce0fa90534 Mon Sep 17 00:00:00 2001
From: Steve Shenton <sgsit@libreboot.org>
Date: Fri, 12 Dec 2014 12:42:01 +0000
-Subject: [PATCH 11/17] northbridge/gm45/raminit.c: enable GS45
- high-performance mode
+Subject: [PATCH] northbridge/gm45/raminit.c: enable GS45 high-performance mode
The datasheets for GS45 describe a high- and low-performance mode
for different CPUs. Coreboot currently disables GS45 altogether,
diff --git a/resources/libreboot/patch/0012-gm45-fix-uneven-backlight-native-gfx-init.patch b/resources/libreboot/patch/0010-gm45-fix-uneven-backlight-native-gfx-init.patch
index 1172d613..c06f19d1 100644
--- a/resources/libreboot/patch/0012-gm45-fix-uneven-backlight-native-gfx-init.patch
+++ b/resources/libreboot/patch/0010-gm45-fix-uneven-backlight-native-gfx-init.patch
@@ -1,7 +1,7 @@
-From cb40445b1debc5900835f94d0aa3287cc213a0d5 Mon Sep 17 00:00:00 2001
+From bea0f09575914be6f2d35dbc53220bce6ac03aac Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 29 Dec 2014 21:02:48 +0000
-Subject: [PATCH 12/17] gm45: fix uneven backlight (native gfx init)
+Subject: [PATCH 10/13] gm45: fix uneven backlight (native gfx init)
When setting brightness levels low, backlight becomes uneven.
This patch fixes that.
diff --git a/resources/libreboot/patch/0013-lenovo-r400-Add-clone-of-Lenovo-T400.patch b/resources/libreboot/patch/0011-lenovo-r400-Add-clone-of-Lenovo-T400.patch
index 04f7076d..449556fe 100644
--- a/resources/libreboot/patch/0013-lenovo-r400-Add-clone-of-Lenovo-T400.patch
+++ b/resources/libreboot/patch/0011-lenovo-r400-Add-clone-of-Lenovo-T400.patch
@@ -1,7 +1,7 @@
-From f5755e978b6a1b10adb0bfeb4c3fd790315c4848 Mon Sep 17 00:00:00 2001
+From 93c1510605981a38c6d616a9c77a7675d7c66b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
Date: Tue, 3 Feb 2015 23:26:05 +0100
-Subject: [PATCH 13/17] lenovo/r400: Add clone of Lenovo T400
+Subject: [PATCH 11/13] lenovo/r400: Add clone of Lenovo T400
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -57,7 +57,7 @@ index 0000000..007ec6c
+Flashrom support: n
+Clone of: lenovo/t400
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
-index a1d0652..2ea592f 100644
+index e410f20..467cd63 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -1,4 +1,4 @@
@@ -66,7 +66,7 @@ index a1d0652..2ea592f 100644
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
-@@ -26,10 +26,14 @@ config MAINBOARD_DIR
+@@ -27,10 +27,14 @@ config MAINBOARD_DIR
string
default lenovo/t400
diff --git a/resources/libreboot/patch/0014-lenovo-t500-Add-clone-of-Lenovo-T400.patch b/resources/libreboot/patch/0012-lenovo-t500-Add-clone-of-Lenovo-T400.patch
index dee34fe8..0ed8f080 100644
--- a/resources/libreboot/patch/0014-lenovo-t500-Add-clone-of-Lenovo-T400.patch
+++ b/resources/libreboot/patch/0012-lenovo-t500-Add-clone-of-Lenovo-T400.patch
@@ -1,7 +1,7 @@
-From 44b02659da616c6d64445e5645684a68e7e5e742 Mon Sep 17 00:00:00 2001
+From 330670470afd0b12fd58f8cf734cb3c85c3a20f5 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 14 Jun 2015 15:40:00 +0100
-Subject: [PATCH 14/17] lenovo/t500: Add clone of Lenovo T400
+Subject: [PATCH 12/13] lenovo/t500: Add clone of Lenovo T400
The existing code for the Lenovo T400 works without changes on the
Lenovo T500. Same HDA verbs are provided by Lenovo BIOS on both
@@ -20,7 +20,7 @@ Signed-off-by: Francis Rowe <info@gluglug.org.uk>
create mode 100644 src/mainboard/lenovo/t500/board_info.txt
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
-index 2ea592f..b1f7d28 100644
+index 467cd63..0eac311 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -1,4 +1,4 @@
diff --git a/resources/libreboot/patch/0015-ec-lenovo-h8-re-factor-handling-of-power_management_.patch b/resources/libreboot/patch/0013-ec-lenovo-h8-re-factor-handling-of-power_management_.patch
index e5d6debf..03f6e272 100644
--- a/resources/libreboot/patch/0015-ec-lenovo-h8-re-factor-handling-of-power_management_.patch
+++ b/resources/libreboot/patch/0013-ec-lenovo-h8-re-factor-handling-of-power_management_.patch
@@ -1,7 +1,7 @@
-From 5fdab56649a84249c8eecd30caa34318ebde6b1d Mon Sep 17 00:00:00 2001
+From fc3e9f93b5b08abe1a684550d2ddda998657882b Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Fri, 12 Jun 2015 23:10:52 +0100
-Subject: [PATCH 15/17] ec/lenovo/h8: re-factor handling of
+Subject: [PATCH 13/13] ec/lenovo/h8: re-factor handling of
power_management_beeps
The current code duplicates the same check unnecessarily,
@@ -15,7 +15,7 @@ Signed-off-by: Francis Rowe <info@gluglug.org.uk>
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
-index b6bc406..fde408c 100644
+index a6cb6b6..6493ec2 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -2,6 +2,7 @@
diff --git a/resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch b/resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch
deleted file mode 100644
index 98ce60a3..00000000
--- a/resources/libreboot/patch/0016-mainboard-asus-kfsn4-dre-Enable-VGA-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3a8ac6c1ea904ac6885683962ce17c51941ba33d Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <tpearson@raptorengineeringinc.com>
-Date: Fri, 26 Jun 2015 14:56:51 -0500
-Subject: [PATCH] mainboard/asus/kfsn4-dre: Enable VGA support
-
-The ASUS KFSN4-DRE has full native VGA support, enable it
-by default in the Kconfig files.
-
-Change-Id: I09fc8845a30f26ca49f3547812f9784621ff4b5e
-Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
----
- src/mainboard/asus/kfsn4-dre/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mainboard/asus/kfsn4-dre/Kconfig b/src/mainboard/asus/kfsn4-dre/Kconfig
-index 9d9ab1e..28b5dcd 100644
---- a/src/mainboard/asus/kfsn4-dre/Kconfig
-+++ b/src/mainboard/asus/kfsn4-dre/Kconfig
-@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
- select MMCONF_SUPPORT_DEFAULT
- select DRIVERS_I2C_W83793
- select DRIVERS_XGI_Z9S
-+ select VGA
- select MAINBOARD_HAS_NATIVE_VGA_INIT
- select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
-
---
-1.9.1
-