From d4bee5d0fb8b8775af2a0da356fce9d3bf8104bb Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 4 May 2015 14:58:54 +0100
Subject: Update coreboot + merge GM45 hybrid GPU patches

Also add power_on_after_fail to X200 and others (prevents the bug
where the system would boot when connecting the AC adapter)
(option in menuconfig to use CMOS/nvram settings is now enabled)

Also NetDCDC is now the default USB debug dongle used (compatible
with the BBB rev C).

Add two new methods for managing coreboot configs:
./build config corebootreplace
./build config corebootmodify
---
 docs/git/index.html                                |  47 ++++---
 docs/hcl/r400.html                                 |   3 +-
 docs/hcl/t400.html                                 |   3 +-
 docs/hcl/t500.html                                 |   3 +-
 docs/install/r400_external.html                    |  12 +-
 docs/install/t400_external.html                    |  12 +-
 docs/install/t500_external.html                    |  12 +-
 docs/maintain/index.html                           |   3 +-
 docs/tasks.html                                    |  31 ++---
 resources/libreboot/config/macbook21/config        |  26 +++-
 .../libreboot/config/qemu_i440fx_piix4/config      |  23 +++-
 resources/libreboot/config/qemu_q35_ich9/config    |  26 +++-
 resources/libreboot/config/r400_4mb/config         |  31 +++--
 resources/libreboot/config/r400_8mb/config         |  31 +++--
 resources/libreboot/config/t400_4mb/config         |  33 +++--
 resources/libreboot/config/t400_8mb/config         |  33 +++--
 resources/libreboot/config/t500_4mb/config         |  33 +++--
 resources/libreboot/config/t500_8mb/config         |  33 +++--
 resources/libreboot/config/t60/config              |  27 +++-
 resources/libreboot/config/x200_4mb/config         |  43 +++----
 resources/libreboot/config/x200_8mb/config         |  43 +++----
 resources/libreboot/config/x60/config              |  26 +++-
 .../scripts/helpers/build/config/corebootmodify    |  46 +++++++
 .../scripts/helpers/build/config/corebootreplace   |  45 +++++++
 .../scripts/helpers/build/config/corebootupdate    |   9 +-
 resources/scripts/helpers/download/coreboot        |  36 +++++-
 resources/utilities/coreboot-libre/deblob-check    | 143 ++++++++++++++++++++-
 resources/utilities/coreboot-libre/nonblobs        |  17 ++-
 28 files changed, 609 insertions(+), 221 deletions(-)
 create mode 100755 resources/scripts/helpers/build/config/corebootmodify
 create mode 100755 resources/scripts/helpers/build/config/corebootreplace
 mode change 100755 => 100644 resources/utilities/coreboot-libre/deblob-check

diff --git a/docs/git/index.html b/docs/git/index.html
index a9d995a3..88a547c7 100644
--- a/docs/git/index.html
+++ b/docs/git/index.html
@@ -323,6 +323,8 @@
 				</h2>
 					<ul>
 						<li>General setup / Expert mode = <i>enable</i></li>
+						<li>General / Use CMOS for configuration values = <i>enable</i></li>
+						<li>General / Load default configuration values into CMOS on each boot = <i>enable</i></li>
 						<li>Mainboard / Mainboard vendor = <i>Lenovo</i></li>
 						<li>Mainboard / Mainboard model = <i>ThinkPad X60 / X60s / X60t</i></li>
 						<li>Mainboard / ROM chip size = <i>2048 KB (2 MB)</i></li>
@@ -335,12 +337,11 @@
 								to enable coreboot framebuffer for a separate set of ROM images, in each machine.</li>
 							</ul>
 						</li>
-						<li>Generic Drivers / Digitizer = <i>Autodetect</i></li>
 						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
 						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
-						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
+						<li>Generic Drivers / Type of dongle = <i>Net20DC or compatible</i></li>
 						<li>Generic Drivers / Digitizer = <i>Present</i></li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						
 						<li>Console / USB dongle log output = <i>enable</i></li>
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
@@ -368,6 +369,8 @@
 					<ul>
 						<li>General setup / Expert mode = <i>enable</i></li>
 						<li>General setup / Local version string = <i>79ETE7WW (2.27 )</i></li>
+						<li>General / Use CMOS for configuration values = <i>enable</i></li>
+						<li>General / Load default configuration values into CMOS on each boot = <i>enable</i></li>
 						<li>Mainboard / Mainboard vendor = <i>Lenovo</i></li>
 						<li>Mainboard / Mainboard model = <i>ThinkPad T60 / T60p</i></li>
 						<li>Mainboard / ROM chip size = <i>2048 KB (2 MB)</i></li>
@@ -386,8 +389,8 @@
 						</li>
 						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
 						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
-						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						<li>Generic Drivers / Type of dongle = <i>Net20DC or compatible</i></li>
+						
 						<li>Console / USB dongle log output = <i>enable</i></li>
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
@@ -418,6 +421,8 @@
 					</p>
 					<ul>
 						<li>General / Expert mode = <i>enable</i></li>
+						<li>General / Use CMOS for configuration values = <i>enable</i></li>
+						<li>General / Load default configuration values into CMOS on each boot = <i>enable</i></li>
 						<li>Mainboard / Mainboard vendor = <i>Lenovo</i></li>
 						<li>Mainboard / Mainboard model = <i>ThinkPad X200</i></li>
 						<li>Mainboard / ROM chip size = <i>4096 KB (4 MB)</i> or <i>8192 KB (8 MB)</i> depending on flash chip size</li>
@@ -433,8 +438,8 @@
 						</li>
 						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
 						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
-						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						<li>Generic Drivers / Type of dongle = <i>Net20DC or compatible</i></li>
+						
 						<li>Console / USB dongle log output = <i>enable</i></li>
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
@@ -462,6 +467,8 @@
 					</p>
 					<ul>
 						<li>General / Expert mode = <i>enable</i></li>
+						<li>General / Use CMOS for configuration values = <i>enable</i></li>
+						<li>General / Load default configuration values into CMOS on each boot = <i>enable</i></li>
 						<li>Mainboard / Mainboard vendor = <i>Lenovo</i></li>
 						<li>Mainboard / Mainboard model = <i>ThinkPad R400</i></li>
 						<li>Mainboard / ROM chip size = <i>4096 KB (4 MB)</i> or <i>8192 KB (8 MB)</i> depending on flash chip size</li>
@@ -477,8 +484,8 @@
 						</li>
 						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
 						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
-						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						<li>Generic Drivers / Type of dongle = <i>Net20DC or compatible</i></li>
+						
 						<li>Console / USB dongle log output = <i>enable</i></li>
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
@@ -506,6 +513,8 @@
 					</p>
 					<ul>
 						<li>General / Expert mode = <i>enable</i></li>
+						<li>General / Use CMOS for configuration values = <i>enable</i></li>
+						<li>General / Load default configuration values into CMOS on each boot = <i>enable</i></li>
 						<li>Mainboard / Mainboard vendor = <i>Lenovo</i></li>
 						<li>Mainboard / Mainboard model = <i>ThinkPad T400</i></li>
 						<li>Mainboard / ROM chip size = <i>4096 KB (4 MB)</i> or <i>8192 KB (8 MB)</i> depending on flash chip size</li>
@@ -521,8 +530,8 @@
 						</li>
 						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
 						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
-						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						<li>Generic Drivers / Type of dongle = <i>Net20DC or compatible</i></li>
+						
 						<li>Console / USB dongle log output = <i>enable</i></li>
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
@@ -550,6 +559,8 @@
 					</p>
 					<ul>
 						<li>General / Expert mode = <i>enable</i></li>
+						<li>General / Use CMOS for configuration values = <i>enable</i></li>
+						<li>General / Load default configuration values into CMOS on each boot = <i>enable</i></li>
 						<li>Mainboard / Mainboard vendor = <i>Lenovo</i></li>
 						<li>Mainboard / Mainboard model = <i>ThinkPad T500</i></li>
 						<li>Mainboard / ROM chip size = <i>4096 KB (4 MB)</i> or <i>8192 KB (8 MB)</i> depending on flash chip size</li>
@@ -565,8 +576,8 @@
 						</li>
 						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
 						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
-						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						<li>Generic Drivers / Type of dongle = <i>Net20DC or compatible</i></li>
+						
 						<li>Console / USB dongle log output = <i>enable</i></li>
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
@@ -592,6 +603,8 @@
 					<ul>
 						<li>General / Expert mode = <i>enable</i></li>
 						<li>General / Local version string = <i>&quot;&nbsp;&nbsp;&nbsp;&nbsp;MB21.88Z.00A5.B07.0706270922&quot;</i> (without the quotes)</li>
+						<li>General / Use CMOS for configuration values = <i>enable</i></li>
+						<li>General / Load default configuration values into CMOS on each boot = <i>enable</i></li>
 						<li>Mainboard / Mainboard vendor = <i>Apple</i></li>
 						<li>Mainboard / Mainboard model = <i>Macbook2,1 ICH7 TESTING</i></li>
 						<li>Mainboard / ROM chip size = <i>2048 KB (2 MB)</i></li>
@@ -610,8 +623,8 @@
 						</li>
 						<li>Generic Drivers / USB 2.0 EHCI debug dongle support = <i>Enable</i></li>
 						<li>Generic Drivers / Enable early (pre-RAM) usbdebug = <i>Enable</i></li>
-						<li>Generic Drivers / Type of dongle = <i>BeagleBone Black</i></li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						<li>Generic Drivers / Type of dongle = <i></i></li>
+						
 						<li>Console / USB dongle log output = <i>enable</i></li>
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
@@ -646,7 +659,7 @@
 								to enable coreboot text-mode for a separate set of ROM images, in each machine.</li>
 							</ul>
 						</li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
 					</ul>
@@ -680,7 +693,7 @@
 								to enable coreboot text-mode for a separate set of ROM images, in each machine.</li>
 							</ul>
 						</li>
-						<li>Console / Send console output to a CBMEM buffer = <i>enable</i></li>
+						
 						<li>Payload / Add a payload = <i>An ELF executable payload</i></li>
 						<li>Payload / Payload path and filename = <i>grub.elf</i></li>
 					</ul>
diff --git a/docs/hcl/r400.html b/docs/hcl/r400.html
index 8b4c4ae7..be41697e 100644
--- a/docs/hcl/r400.html
+++ b/docs/hcl/r400.html
@@ -18,8 +18,7 @@
 			
 			<p>
 				It is believed that all or most R400 laptops are compatible. 
-				See notes about <a href="../install/r400_external.html#cpu_compatibility">CPU compatibility</a>
-				and <a href="../install/r400_external.html#switchable_graphics">switchable graphics</a> for
+				See notes about <a href="../install/r400_external.html#cpu_compatibility">CPU compatibility</a> for
 				potential incompatibilities.
 			</p>
 			
diff --git a/docs/hcl/t400.html b/docs/hcl/t400.html
index 208d2065..23811938 100644
--- a/docs/hcl/t400.html
+++ b/docs/hcl/t400.html
@@ -19,8 +19,7 @@
 			<p>
 				It is believed that all or most T400 laptops are compatible. 
 				See notes about <a href="../install/t400_external.html#cpu_compatibility">CPU compatibility</a>
-				and <a href="../install/t400_external.html#switchable_graphics">switchable graphics</a> for
-				potential incompatibilities.
+				for potential incompatibilities.
 			</p>
 			
 			<p>
diff --git a/docs/hcl/t500.html b/docs/hcl/t500.html
index cbf67c8c..0f9c7937 100644
--- a/docs/hcl/t500.html
+++ b/docs/hcl/t500.html
@@ -19,8 +19,7 @@
 			<p>
 				It is believed that all or most T500 laptops are compatible. 
 				See notes about <a href="../install/t500_external.html#cpu_compatibility">CPU compatibility</a>
-				and <a href="../install/t500_external.html#switchable_graphics">switchable graphics</a> for
-				potential incompatibilities.
+				for potential incompatibilities.
 			</p>
 			
 			<p>
diff --git a/docs/install/r400_external.html b/docs/install/r400_external.html
index db8d3759..4dd6f9ce 100644
--- a/docs/install/r400_external.html
+++ b/docs/install/r400_external.html
@@ -81,16 +81,8 @@
 			
 			<p>
 				Libreboot is known to work on systems with only the Intel GPU, using native graphics initialization.
-				On systems with switchable graphics, it is believed that the ATI chip is used by default; coreboot
-				was tested with the native init and it didn't work, so the theory is that you have to disable
-				the ATI chip and make it use the Intel GPU instead (with native graphics), using the same method
-				as lenovobios. The other alternative is to implement native graphics initialization for the ATI chip
-				used on some models, but this is much harder (disabling the ATI chip in favour of Intel is likely much easier).
-			</p>
-			
-			<p>
-				For now (unless you want to help make systems with switchable graphics work, where a display
-				is initialized for the Intel GPU), you should avoid systems with switchable graphics.
+				On systems with switchable graphics, the Intel GPU is used and the ATI GPU is disabled, so
+				native graphics initialization works all the same.
 			</p>
 			
 		<h1>CPU paste required</h1>
diff --git a/docs/install/t400_external.html b/docs/install/t400_external.html
index 8811f30f..1eb25163 100644
--- a/docs/install/t400_external.html
+++ b/docs/install/t400_external.html
@@ -75,16 +75,8 @@
 			
 			<p>
 				Libreboot is known to work on systems with only the Intel GPU, using native graphics initialization.
-				On systems with switchable graphics, it is believed that the ATI chip is used by default; coreboot
-				was tested with the native init and it didn't work, so the theory is that you have to disable
-				the ATI chip and make it use the Intel GPU instead (with native graphics), using the same method
-				as lenovobios. The other alternative is to implement native graphics initialization for the ATI chip
-				used on some models, but this is much harder (disabling the ATI chip in favour of Intel is likely much easier).
-			</p>
-			
-			<p>
-				For now (unless you want to help make systems with switchable graphics work, where a display
-				is initialized for the Intel GPU), you should avoid systems with switchable graphics.
+				On systems with switchable graphics, the Intel GPU is used and the ATI GPU is disabled, so
+				native graphics initialization works all the same.
 			</p>
 			
 		<h1>CPU paste required</h1>
diff --git a/docs/install/t500_external.html b/docs/install/t500_external.html
index 32f87a08..77a8b43a 100644
--- a/docs/install/t500_external.html
+++ b/docs/install/t500_external.html
@@ -76,16 +76,8 @@
 			
 			<p>
 				Libreboot is known to work on systems with only the Intel GPU, using native graphics initialization.
-				On systems with switchable graphics, it is believed that the ATI chip is used by default; coreboot
-				was tested with the native init and it didn't work, so the theory is that you have to disable
-				the ATI chip and make it use the Intel GPU instead (with native graphics), using the same method
-				as lenovobios. The other alternative is to implement native graphics initialization for the ATI chip
-				used on some models, but this is much harder (disabling the ATI chip in favour of Intel is likely much easier).
-			</p>
-			
-			<p>
-				For now (unless you want to help make systems with switchable graphics work, where a display
-				is initialized for the Intel GPU), you should avoid systems with switchable graphics.
+				On systems with switchable graphics, the Intel GPU is used and the ATI GPU is disabled, so
+				native graphics initialization works all the same.
 			</p>
 			
 		<h1>CPU paste required</h1>
diff --git a/docs/maintain/index.html b/docs/maintain/index.html
index 777a19d5..71aa2e8e 100644
--- a/docs/maintain/index.html
+++ b/docs/maintain/index.html
@@ -261,7 +261,8 @@
 				This simply takes all of the coreboot <b>.config</b> files from
 				<i>resources/libreboot/config/</i> and does <b>make oldconfig</b>
 				on them. It usually works. If it doesn't, you'll need to recreate
-				those configs from scratch using <b>make menuconfig</b> in coreboot
+				those configs from scratch using <b>./build config corebootreplace</b> (optionally
+				add a config name), or <b>./build config corebootmodify</b> (ditto)
 				(see <a href="../git/index.html#config">../git/index.html#config</a>)
 			</p>
 
diff --git a/docs/tasks.html b/docs/tasks.html
index 355c121b..2d9771cd 100644
--- a/docs/tasks.html
+++ b/docs/tasks.html
@@ -166,12 +166,6 @@
 									Sound (internal speaker) worked on the T500, but stopped after all subsequent boots.
 									(might just be this machine). investigate. (external speaker works)
 								</li>
-								<li>
-									<b><u><i>HIGH PRIORITY!</i></u></b> T400/T500/R400/R500: make switchable graphics work
-									(disable the ATI chip, enable the Intel GPU, make it work with the native graphics initialization
-									that already exists and works (on the systems that only have an Intel GPU))
-									<b>The patches are on gerrit. merge them in libreboot</b>
-								</li>
 								<li>
 									tty0_ in #libreboot got tablet functions on X200T to work. Wait for it to land in gerrit
 									(and master)? also test it first. For now, here is a paste:
@@ -193,13 +187,6 @@
 								<li>On another X200, this did not occur. It might be that old versions of the EC have this bug</li>
 							</ul>
 						</li>
-						<li>
-							X200/T400/T500/R400/R500: when system is powered down, connecting the AC adapter
-							automatically turns it on. This should be configurable, but disabled by default.
-							<i>power_on_after_fail</i> is the nvramtool option for this (should be disabled by default)
-							but no option for it exists on the X200 (it does on the X201). Add this option to cmos.layout/cmos.default
-							for these systems, and then disable it by default to fix it.
-						</li>
 						<li>
 							<b>Finish all work listed in <a href="future/index.html">future/index.html</a></b>
 						</li>
@@ -265,6 +252,10 @@
 									Fix remaining incompatible LCD panels in native graphics on T60. 
 									See <a href="future/index.html#lcd_i945_incompatibility">future/index.html#lcd_i945_incompatibility</a>.
 								</li>
+								<li>
+									Fix remaining incompatible LCD panels in native graphics on T500. 
+									See <a href="hcl/t500.html">hcl/t500.html</a>.
+								</li>
 								<li>
 									i945: the intel video driver used to initialize the display without native graphics initialization
 									and without the extracted video BIOS. It no longer does, so investigate why it does not, and fix
@@ -337,11 +328,15 @@
 						memtest86+ doesn't even work at all when cross-compiled using the toolchain in x86-64 trisquel7</b></li>
 						<li>
 							<b><u><i>HIGH PRIORITY</i></u></b> GRUB does not display any text at all when using EHCI debug. Investigate.
-						</li>
-						<li>
-							<b><u><i>HIGH PRIORITY</i></u></b> Confirm that the EHCI debug options enabled in coreboot menuconfig are correct
-							for the current versions of the BBB (rev. C or higher). Search <b>EHCI debug</b> on
-							<a href="install/bbb_setup.html">install/bbb_setup.html</a>
+							<ul>
+								<li>It has to do with the dongle used. Use the default one in menuconfig, not BBB.</li>
+								<li>
+									<b><u><i>HIGH PRIORITY</i></u></b> Confirm that the EHCI debug options enabled in coreboot menuconfig are correct
+									for the current versions of the BBB (rev. C or higher). Search <b>EHCI debug</b> on
+									<a href="install/bbb_setup.html">install/bbb_setup.html</a>
+								</li>
+
+							</ul>
 						</li>
 						<li>
 							Make libreboot (all of it!) build reproducibly. This is very important.
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 3f6752cb..845154dd 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -15,7 +15,7 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_STATIC_OPTION_TABLE is not set
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -26,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -118,6 +119,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -146,6 +148,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -177,22 +180,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -208,6 +217,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_6EX=y
@@ -270,6 +280,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 
 #
@@ -313,6 +324,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -327,6 +339,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -353,9 +366,9 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -379,13 +392,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -459,6 +470,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/qemu_i440fx_piix4/config b/resources/libreboot/config/qemu_i440fx_piix4/config
index 70a23ca4..ab199084 100644
--- a/resources/libreboot/config/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/qemu_i440fx_piix4/config
@@ -25,6 +25,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -118,6 +119,7 @@ CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
 CONFIG_BOARD_EMULATION_QEMU_X86=y
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_IO=y
@@ -144,6 +146,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -172,22 +175,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 
@@ -202,6 +211,7 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_SMM_TSEG_SIZE=0
@@ -249,6 +259,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 CONFIG_SOUTH_BRIDGE_OPTIONS=y
 
@@ -281,6 +292,8 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
+# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -310,6 +323,7 @@ CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -356,12 +370,10 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -416,6 +428,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_STABLE is not set
+# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
@@ -433,6 +447,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/qemu_q35_ich9/config
index 6585e226..9c048e94 100644
--- a/resources/libreboot/config/qemu_q35_ich9/config
+++ b/resources/libreboot/config/qemu_q35_ich9/config
@@ -24,6 +24,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -106,6 +107,7 @@ CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
+CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_UART_FOR_CONSOLE=0
@@ -115,9 +117,9 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 # CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
-CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_IO=y
@@ -145,6 +147,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -172,22 +175,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 
@@ -202,6 +211,7 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_SMM_TSEG_SIZE=0
@@ -252,6 +262,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -283,6 +294,8 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
+# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
+# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -295,6 +308,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -312,6 +326,7 @@ CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -358,12 +373,10 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -417,6 +430,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
+# CONFIG_SEABIOS_STABLE is not set
+# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
@@ -435,6 +450,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/r400_4mb/config b/resources/libreboot/config/r400_4mb/config
index 3537c0d4..cc2f35fd 100644
--- a/resources/libreboot/config/r400_4mb/config
+++ b/resources/libreboot/config/r400_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/r400_8mb/config b/resources/libreboot/config/r400_8mb/config
index a019f6d9..edbe5398 100644
--- a/resources/libreboot/config/r400_8mb/config
+++ b/resources/libreboot/config/r400_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t400_4mb/config b/resources/libreboot/config/t400_4mb/config
index 678bea25..aa269c11 100644
--- a/resources/libreboot/config/t400_4mb/config
+++ b/resources/libreboot/config/t400_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t400_8mb/config b/resources/libreboot/config/t400_8mb/config
index d89ad9b0..765e14de 100644
--- a/resources/libreboot/config/t400_8mb/config
+++ b/resources/libreboot/config/t400_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t500_4mb/config b/resources/libreboot/config/t500_4mb/config
index a488c871..b4df5d87 100644
--- a/resources/libreboot/config/t500_4mb/config
+++ b/resources/libreboot/config/t500_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t500_8mb/config b/resources/libreboot/config/t500_8mb/config
index a5219e61..46ff494b 100644
--- a/resources/libreboot/config/t500_8mb/config
+++ b/resources/libreboot/config/t500_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index 9accfb2c..77bb0ccd 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -219,6 +229,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_6EX=y
@@ -281,6 +292,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
 
@@ -331,6 +343,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -345,6 +358,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -372,9 +386,9 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -398,13 +412,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -478,6 +490,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config
index c57404e8..c673b824 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/x200_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -110,7 +112,6 @@ CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
@@ -157,6 +158,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +190,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +226,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +282,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -289,7 +299,6 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # SoC
 #
-CONFIG_TTYS0_BASE=0x3f8
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA132 is not set
 CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0
@@ -319,6 +328,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +344,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -350,8 +361,8 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
-CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
@@ -361,9 +372,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -376,24 +387,11 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +464,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/x200_8mb/config
index 377e62ae..dd812535 100644
--- a/resources/libreboot/config/x200_8mb/config
+++ b/resources/libreboot/config/x200_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -110,7 +112,6 @@ CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
@@ -157,6 +158,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +190,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +226,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +282,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -289,7 +299,6 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # SoC
 #
-CONFIG_TTYS0_BASE=0x3f8
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA132 is not set
 CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0
@@ -319,6 +328,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +344,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -350,8 +361,8 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
-CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
@@ -361,9 +372,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -376,24 +387,11 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +464,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 27d795d9..14942839 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -15,7 +15,7 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_STATIC_OPTION_TABLE is not set
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -26,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -117,6 +118,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -159,6 +161,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -190,22 +193,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -221,6 +230,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_6EX=y
@@ -283,6 +293,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
 
@@ -333,6 +344,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -347,6 +359,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -377,9 +390,9 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -403,13 +416,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -485,6 +496,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/scripts/helpers/build/config/corebootmodify b/resources/scripts/helpers/build/config/corebootmodify
new file mode 100755
index 00000000..cb22008b
--- /dev/null
+++ b/resources/scripts/helpers/build/config/corebootmodify
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+#
+#  helper script: run "make menuconfig" on config(s) to modify them
+#
+#	Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This script assumes that the working directory is the root
+# of libreboot_src or git
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u -e
+
+cd resources/libreboot/config/
+
+if [ $# -lt 1 ]; then
+	configs=$(ls)
+else
+	configs=$@
+fi
+
+cd ../../../coreboot/
+for config in $configs; do
+	printf "Updating config for $config\n"
+	sleep 5
+	
+	mv ../resources/libreboot/config/$config/config .config
+	make menuconfig
+	mv .config ../resources/libreboot/config/$config/config
+done
+
+cd ../
diff --git a/resources/scripts/helpers/build/config/corebootreplace b/resources/scripts/helpers/build/config/corebootreplace
new file mode 100755
index 00000000..9be5c9a5
--- /dev/null
+++ b/resources/scripts/helpers/build/config/corebootreplace
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+#
+#  helper script: run "make menuconfig" on config(s) to replace them
+#
+#	Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This script assumes that the working directory is the root
+# of libreboot_src or git
+
+[ "x${DEBUG+set}" = 'xset' ] && set -v
+set -u -e
+
+cd resources/libreboot/config/
+
+if [ $# -lt 1 ]; then
+	configs=$(ls)
+else
+	configs=$@
+fi
+
+cd ../../../coreboot/
+for config in $configs; do
+	printf "Updating config for $config\n"
+	sleep 5
+	
+	make menuconfig
+	mv .config ../resources/libreboot/config/$config/config
+done
+
+cd ../
diff --git a/resources/scripts/helpers/build/config/corebootupdate b/resources/scripts/helpers/build/config/corebootupdate
index 22611485..4e4db748 100755
--- a/resources/scripts/helpers/build/config/corebootupdate
+++ b/resources/scripts/helpers/build/config/corebootupdate
@@ -26,12 +26,17 @@
 set -u -e
 
 cd resources/libreboot/config/
-configs=$(ls)
+
+if [ $# -lt 1 ]; then
+	configs=$(ls)
+else
+	configs=$@
+fi
 
 cd ../../../coreboot/
 for config in $configs; do
 	printf "Updating config for $config\n"
-	sleep 2
+	sleep 5
 	
 	mv ../resources/libreboot/config/$config/config .config
 	make oldconfig
diff --git a/resources/scripts/helpers/download/coreboot b/resources/scripts/helpers/download/coreboot
index 54ada0e3..01ae142d 100755
--- a/resources/scripts/helpers/download/coreboot
+++ b/resources/scripts/helpers/download/coreboot
@@ -44,11 +44,37 @@ git clone http://review.coreboot.org/coreboot
 cd coreboot/
 
 # reset to previously tested revision
-git reset --hard 8e3da749ed912834ddf9b78bff956a2b7d269945
+# git reset --hard e19c8b0091022ae3f490601aed0c290cd5171b79
+# ^ currently, the first patch is downloaded using "checkout" so this automatically
+# branches from the git revision that it was uploaded for. that would be 
+# e19c8b0091022ae3f490601aed0c290cd5171b79
 
 # Get patches from review.coreboot.org
 # ------------------------------------------------------------------------------
 
+# ----
+
+printf "Downloading patches for T400 (hybrid graphics and other fixes)"
+git fetch http://review.coreboot.org/coreboot refs/changes/31/9331/7 && git checkout FETCH_HEAD
+
+# Downloads these patches:
+# http://review.coreboot.org/#/c/9318/
+# http://review.coreboot.org/#/c/9330/
+# http://review.coreboot.org/#/c/9329/
+# http://review.coreboot.org/#/c/9370/
+# http://review.coreboot.org/#/c/9321/
+# http://review.coreboot.org/#/c/9332/
+# http://review.coreboot.org/#/c/9316
+# http://review.coreboot.org/#/c/9317/
+# http://review.coreboot.org/#/c/9319
+# http://review.coreboot.org/#/c/9320/
+# http://review.coreboot.org/#/c/9331/
+
+# Related - hard-code enable integrated-only GPU (GM45):
+git fetch http://review.coreboot.org/coreboot refs/changes/90/10090/2 && git cherry-pick FETCH_HEAD
+
+# ----
+
 printf "Text mode patch for X60 native graphics (main patch already merged in coreboot. See 6723 on coreboot gerrit)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/25/6725/3 && git cherry-pick FETCH_HEAD
 
@@ -76,12 +102,10 @@ git fetch http://review.coreboot.org/coreboot refs/changes/86/7786/1 && git cher
 printf "fix uneven backlight on X200 (when setting brightness low)\n"
 git fetch http://review.coreboot.org/coreboot refs/changes/79/7979/1 && git cherry-pick FETCH_HEAD
 
-printf "ThinkPad R400 support\n"
-git fetch http://review.coreboot.org/coreboot refs/changes/93/8393/2 && git cherry-pick FETCH_HEAD
-printf "ThinkPad T400 (depends on R400 patch)\n"
-git fetch http://review.coreboot.org/coreboot refs/changes/14/8714/4 && git cherry-pick FETCH_HEAD
+printf "ThinkPad R400 support (clone of the T400)\n"
+git fetch http://review.coreboot.org/coreboot refs/changes/93/8393/3 && git cherry-pick FETCH_HEAD
 printf "ThinkPad T500 (depends on T400 patch)\n"
-git fetch http://review.coreboot.org/coreboot refs/changes/81/9181/1 && git cherry-pick FETCH_HEAD
+git fetch http://review.coreboot.org/coreboot refs/changes/81/9181/2 && git cherry-pick FETCH_HEAD
 
 # Run coreboot-libre deblob scripts
 # ------------------------------------------------------------------------------
diff --git a/resources/utilities/coreboot-libre/deblob-check b/resources/utilities/coreboot-libre/deblob-check
old mode 100755
new mode 100644
index ce9ac1cb..cc217d40
--- a/resources/utilities/coreboot-libre/deblob-check
+++ b/resources/utilities/coreboot-libre/deblob-check
@@ -1,13 +1,13 @@
 #! /bin/sh
 
-# deblob-check version 2014-12-08
+# deblob-check version 2015-04-09
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
 # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer
 # versions.
 
-# Copyright 2008-2014 Alexandre Oliva <lxoliva@fsfla.org>
+# Copyright 2008-2015 Alexandre Oliva <lxoliva@fsfla.org>
 #
 # This program is part of GNU Linux-libre, a GNU project that
 # publishes scripts to clean up Linux so as to make it suitable for
@@ -3969,6 +3969,145 @@ set_except () {
     accept '[\t][\t]dev_err[(][&]dev->dev[,][ ]["]%d[,][ ]request_firmware[ ]failed' sound/pci/asihpi/hpidspcd.c
     accept 'static[ ]int[ ]snd_ymfpci_request_firmware[(]' sound/pci/ymfpci/ymfpci_main.c
     accept '[\t]err[ ]=[ ]snd_ymfpci_request_firmware[(]' sound/pci/ymfpci/ymfpci_main.c
+    # New in 3.19
+    blobname 'a420_p\(m4\|fp\)\.fw' drivers/gpu/drm/msm/adreno/adreno_device.c
+    defsnc 'static[ ]const[ ]unsigned[ ]int[ ]a4xx_registers\[\][ ]=' drivers/gpu/drm/msm/adreno/a4xx_gpu.c
+    defsnc 'static[ ]const[ ]u32[ ]gen9_null_state_batch\[\][ ]=' drivers/gpu/drm/i915/intel_renderstate_gen9.c
+    defsnc 'nv50_disp_\(core_mthd_head\|base_mthd_base\)[ ]=[ ][{]\([\n][ \t]*\.\(mthd\|addr\)[ ]=[ ]0x00*\([04]0\|54\)0[,]\)*[\n][ \t]*\.data[ ]=' drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+    defsnc 'nv84_disp_\(core_mthd_head\|base_mthd_base\)[ ]=[ ][{]\([\n][ \t]*\.\(mthd\|addr\)[ ]=[ ]0x00*\([04]0\|54\)0[,]\)*[\n][ \t]*\.data[ ]=' drivers/gpu/drm/nouveau/core/engine/disp/nv84.c
+    defsnc 'nvd0_disp_\(core_mthd_head\|base_mthd_base\)[ ]=[ ][{]\([\n][ \t]*\.\(mthd\|addr\)[ ]=[ ]0x00*\(300\)\?[,]\)*[\n][ \t]*\.data[ ]=' drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
+    defsnc 'nve0_disp_\(core_mthd_head\|base_mthd_base\)[ ]=[ ][{]\([\n][ \t]*\.\(mthd\|addr\)[ ]=[ ]0x00*300[,]\)*[\n][ \t]*\.data[ ]=' drivers/gpu/drm/nouveau/core/engine/disp/nve0.c
+    # This reads from user-supplied filenames.
+    accept 'shadow_fw_init[(]struct[ ]nouveau_bios[ ][*]bios[,][ ]const[ ]char[ ][*]name[)][\n][{][\n]\(\([^}\n][^\n]*\)\?[\n]\)*[\t]int[ ]ret[ ]=[ ]request_firmware[(][&]fw[,][ ]name[,][ ]dev[)][;]' drivers/gpu/drm/nouveau/core/subdev/bios/shadow.c
+    defsnc 'static[ ]const[ ]u32[ ]coef_lut_\(a_legacy\|b\|[cdef]_[yc]_legacy\)\[NB_COEF\][ ]=' drivers/gpu/drm/sti/sti_hqvdp_lut.h
+    blobname 'hqvdp-stih407\.bin' drivers/gpu/drm/sti/sti_hqvdp.c
+    defsnc '[\t]static[ ]const[ ]union[ ]sixaxis_output_report_01[ ]default_report[ ]=' drivers/hid/hid-sony.c
+    blobname 'elan_i2c\.bin' drivers/input/mouse/elan_i2c_core.c
+    blobname 'elants_i2c\.bin' drivers/input/touchscreen/elants_i2c.c
+    defsnc '[}][ ]QAM256_mod_tab_zv_mode\[\][ ]=' drivers/media/dvb-frontends/au8522_dig.c
+    blobname 'dvb-demod-m88rs6000\.fw' drivers/media/dvb-frontends/m88ds3103_priv.h
+    defsnc 'static[ ]const[ ]struct[ ]m88ds3103_reg_val[ ]m88rs6000_dvbs2\?_init_reg_vals\[\][ ]=' drivers/media/dvb-frontends/m88ds3103_priv.h
+    defsnc 'static[ ]const[ ]unsigned[ ]char[ ]\(luma\|chroma\)_ac_value\[162[ ][+][ ]2\][ ]=' drivers/media/platform/coda/coda-jpeg.c
+    defsnc 'static[ ]unsigned[ ]char[ ]\(luma\|chroma\)_q\[64\][ ]=' drivers/media/platform/coda/coda-jpeg.c
+    defsnc 'static[ ]const[ ]struct[ ]vin_coeff[ ]vin_coeff_set\[\][ ]=' drivers/media/platform/soc_camera/rcar_vin.c
+    defsnc 'const[ ]unsigned[ ]short[ ]tpg_\(rec709_to_linear\|linear_to_rec709\)\[255[ ][*][ ]16[ ][+][ ]1\][ ]=' drivers/media/platform/vivid/vivid-tpg-colors.c
+    defsnc '[\t]static[ ]const[ ]struct[ ]m88rs6000t_reg_val[ ]reg_vals\[\][ ]=' drivers/media/tuners/m88rs6000t.c
+    blobna '[/][*][ ]cal-<bus>-<id>\.bin[ ][*][/]' drivers/net/wireless/ath/ath10k/core.c
+    blobname 'cal-%s-%s\.bin' drivers/net/wireless/ath/ath10k/core.c
+    defsnc 'static[ ]const[ ]u32[ ]qca953x_2p0_\(common_wo_xlna_rx\|modes_\(no_\)\?xpa_tx\)_gain_table\[\]\[2\][ ]=' drivers/net/wireless/ath/ath9k/ar953x_initvals.h
+    blobname 'mrvl[/]usb8766_uapsta\.bin' drivers/net/wireless/mwifiex/usb.h
+    defsc 'static[ ]const[ ]unsigned[ ]char[ ]opcode_ind_arr\[256\][ ]=' drivers/scsi/scsi_debug.c
+    defsnc 'static[ ]const[ ]struct[ ]quark_spi_rate[ ]quark_spi_rate_table\[\][ ]=' drivers/spi/spi-pxa2xx.c
+    blobname 'me4000_firmware\.bin' drivers/staging/comedi/drivers/me4000.c
+    defsnc '[\t]u8[ ]ConnectionMsg\[\][ ]=' drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+    accept '[\t]pr_info[(]["]load[ ]fpgaimage[ ]%s[\\]n["][,][ ]fw_file[)][;][\n]*[\t]err[ ]=[ ]request_firmware[(][&]fimage->fw_entry[,]' drivers/staging/gs_fpgaboot/gs_fpgaboot.c
+    blobname 'dvb-demod-mn88472-02\.fw' drivers/staging/media/mn88472/mn88472_priv.h
+    blobname 'dvb-demod-mn88473-01\.fw' drivers/staging/media/mn88473/mn88473_priv.h
+    accept '[\t][\t]goto[ ]err_request_firmware[;]' drivers/staging/media/mn88473/mn88473.c
+    accept 'err_request_firmware[:]' drivers/staging/media/mn88473/mn88473.c
+    blob 'The[ ]card[ ]requires[ ]firmware.*[\n]rm[ ]wd7296a\.sys' Documentation/scsi/wd719x.txt
+    blobname 'wd719x-\(wcs\|risc\)\.bin' drivers/scsi/wd719x.c
+    defsnc 'static[ ]const[ ]struct[ ]tsadc_table[ ]v2_code_table\[\][ ]=' drivers/thermal/rockchip_thermal.c
+    defsnc 'static[ ]const[ ]u8[ ]debug_pk\[64\][ ]=' net/bluetooth/smp.c
+    defsnc 'static[ ]const[ ]u8[ ]debug_sk\[32\][ ]=' net/bluetooth/smp.c
+    defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]ad1980_reg_defaults\[\][ ]=' sound/soc/codecs/ad1980.c
+    blobname 'rt5677_dsp_fw[12]\.bin' sound/soc/codecs/rt5677.c
+    accept 'int[ ]sst_request_firmware_async[(]' sound/soc/intel/sst/sst.h
+    blobname 'intel[/]fw_sst_0f28\.bin-48kHz_i2s_master' sound/soc/intel/sst-acpi.c
+    blobname '\(intel[/]\)\?fw_sst_\(0f28\|22a8\)\.bin' sound/soc/intel/sst/sst_acpi.c
+    blobname '%s%04x%s["][,][ ]["]fw_sst_["][,][\n][ \t]*sst_drv_ctx->dev_id[,][ ]["]\.bin' sound/soc/intel/sst/sst_pci.c
+    accept '[\t]\?\(evsel\|machine\|thread\|comm\(_thread\)\?\|dso\|symbol\|branch_type\|sample\|[\t]call\(_path\)\?\)_file[ \t]*=[ ]open_output_file[(]["]\(evsel\|machine\|thread\|comm\(_thread\)\?\|dso\|symbol\|branch_type\|sample\|call\(_path\)\?\)_table\.bin["][)]' tools/perf/scripts/python/export-to-postgresql.py
+    # accept '\([*]\.\(bin\|elf\|fw\)\|\(setup\|wakeup\)\.\(bin\|elf\)\|vmlinux\.bin\.all\|tftpboot\.img\)[\n]' Documentation/dontdiff
+    # New in 4.0.
+    blobname 'intel[/]ibt-11-%u\.sfi' drivers/bluetooth/btusb.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf100_gr_init_\(main\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+    accept '[	][	]*gf100_gr_init_fw[(]priv[,][ ]0x4\(09\|1a\)000[,][ ][&]priv->fuc4\(09\|1a\)c[,][ \n	]*[&]priv->fuc4\(09\|1a\)d[)][;]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+    accept '[	][	 ]*gf100_gr_dtor_fw[(]&priv->fuc4\(09\|1a\)[cd][)][;]' drivers/gpu/drm/nouveua/nvkm/engine/gr/gf100.c
+    accept '[	][	 ]*\(if[ ][(]\|[ ][ ][ ][ ]\)gf100_gr_ctor_fw[(]priv[,][ ]["]fuc4\(09\|1a\)[cd]["][,][ ][&]priv->fuc4\(09\|1a\)[cd][)]' drivers/gpu/drm/nouveua/nvkm/engine/gr/gf100.c
+    blobname 'firmware-4\.bin' drivers/net/wireless/ath/ath10k/hw.h
+    blobname 'brcm[/]brcmfmac43340-sdio\.bin' drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+    blobname 'iwlwifi-7260-' drivers/net/wireless/iwlwifi/pcie/7000.c
+    blobname 'iwlwifi-8000' drivers/net/wireless/iwlwifi/iwl-8000.c
+    blobname 'iwl_nvm_8000B\.bin' drivers/net/wireless/iwlwifi/iwl-8000.c
+    blobname 'mrvl[/]sd8801_uapsta\.bin' drivers/net/wireless/mwifiex/sdio.h
+    blobname 'mrvl[/]usb8801_uapsta\.bin' drivers/net/wireless/mwifiex/usb.h
+    blobname 'ti-connectivity[/]wl18xx-fw-4\.bin' drivers/net/wireless/ti/wl18xx/main.c
+    blobname 'intel[/]fw_sst_22a8\.bin' sound/soc/intel/sst_acpi.c
+    defsnc 'static[ ]const[ ]struct[ ]clk_div_table[ ]z_div_table\[\][ ]=' drivers/clk/shmobile/clk-sh73a0.c
+    defsnc 'uint32_t[ ]gf100_pce_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h
+    defsnc 'uint32_t[ ]gt215_pce_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]nv50_disp_mthd_list[\n]g84_disp_\(base\|core\|ovly\)_mthd_\(dac\|head\|base\)[ ]=' drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]nv50_disp_mthd_list[\n]gf110_disp_\(base\|core\|ovly\)_mthd_\(dac\|head\|base\|sor\|pior\)[ ]=' drivers/gpu/drm/nouveau/nvkm/engine/disp/gf110.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]nv50_disp_mthd_list[\n]gk104_disp_\(core\|ovly\)_mthd_\(head\|base\)[ ]=' drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]nv50_disp_mthd_list[\n]gt200_disp_ovly_mthd_base[ ]=' drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf100_grctx_init_\(icmd\|9097\|902d\|90c0\|fe\|memfmt\|rstr2d\|prop\|setup\|crstr\|zcullr\|wwdx\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf104_grctx_init_\(tex\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf108_grctx_init_\(icmd\|9097\|setup\|wwdx\|tex\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf110_grctx_init_\(icmd\|setup\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf117_grctx_init_\(ds\|pd\|setup\|tex\|wwdx\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf119_grctx_init_\(\(icmd\|90c0\|fe\|ds\|prop\|setup\|crstr\|tex\|sm\)_0\|gpc_unk_1\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gk104_grctx_init_\(icmd\|a097\|fe\|memfmt\|ds\|pd\|be\|setup\|tex\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gk110_grctx_init_\(icmd\|a197\|fe\|pd\|be\|setup\|tex\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gk208_grctx_init_\(icmd\|fe\|ds\|pd\|rstr2d\|be\|prop\|setup\|crstr\|tex\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c
+    defsnc 'uint32_t[ ]gf100_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
+    defsnc 'uint32_t[ ]gf117_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
+    defsnc 'uint32_t[ ]gk104_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
+    defsnc 'uint32_t[ ]gk110_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
+    defsnc 'uint32_t[ ]gk208_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
+    defsnc 'uint32_t[ ]gf100_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
+    defsnc 'uint32_t[ ]gf117_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
+    defsnc 'uint32_t[ ]gk104_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
+    defsnc 'uint32_t[ ]gk110_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
+    defsnc 'uint32_t[ ]gk208_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
+    accept '[	]struct[ ]gf100_gr_fuc[ ]fuc4\(09\|1a\)[cd]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf104_gr_init_\(ds\|tex\|pe\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf110_gr_init_sm_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gf119_gr_init_\(\(pd\|ds\|prop\|gpm\|tex\|pe\|wwdx\|sm\)_0\|\(tpccs\|gpc_unk\|fe\)_1\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gk104_gr_init_\(\(main\|ds\|sked\|cwd\|tpccs\|pe\|l1c\|sm\|be\)_0\|gpc_unk_1\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gk110_gr_init_\(\(fe\|ds\|sked\|cwd\|tex\|l1c\|sm\)_0\|gpc_unk_1\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gk110b_gr_init_\(l1c\|sm\)_0\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gk208_gr_init_\(\(main\|ds\|gpc_unk\|tex\|l1c\)_0\|setup_1\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c
+    defsnc '\(static[ ]\)\?const[ ]struct[ ]gf100_gr_init[\n ]gm107_gr_init_\(\(main\|ds\|scc\|sked\|prop\|zcull\|tpccs\|tex\|pe\|l1c\|sm\|pes\|wwdx\|cbm\|be\)_0\|\(setup\|gpc_unk\|l1c\|sm\)_1\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
+    defsnc 'static[ ]u32[ \n]nv04_gr_ctx_regs\[\][ ]=' drivers/gpu/drm/nouveau/core/engine/graph/nv04.c
+    defsnc 'static[ ]int[ \n]nv10_gr_ctx_regs\[\][ ]=' drivers/gpu/drm/nouveau/core/engine/graph/nv10.c
+    defsnc 'uint32_t[ ]g98_psec_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h
+    accept 'shadow_fw_init[(]struct[ ]nvkm_bios[ ][*]bios[,][ ]const[ ]char[ ][*]name[)][\n][{][\n]\(\([^}\n][^\n]*\)\?[\n]\)*[\t]int[ ]ret[ ]=[ ]request_firmware[(][&]fw[,][ ]name[,][ ]dev[)][;]' drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
+    defsnc 'uint32_t[ ]gf100_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h
+    defsnc 'uint32_t[ ]gf110_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf110.fuc4.h
+    defsnc 'uint32_t[ ]gk208_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
+    defsnc 'uint32_t[ ]gt215_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h
+    defsnc 'static[ ]const[ ]struct[ ]dw_hdmi_mpll_config[ ]rockchip_mpll_cfg\[\][ ]=' drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+    defsnc '[}][ ]kmx61_\(samp_freq\|wake_up_odr\)_table\[\][ ]=' drivers/iio/imu/kmx61.c
+    defsnc 'static[ ]const[ ]u8[ ]jpeg_header\[\][ ]=' drivers/staging/media/solo6x10/solo6x10-jpeg.h
+    defsnc 'static[ ]const[ ]u8[ ]jpeg_dqt\[4\]\[DQT_LEN\][ ]=' drivers/media/pci/solo6x10/solo6x10-jpeg.h
+    defsnc 'static[ ]u8[ ]vop_6010_\(ntsc\|pal\)_\(d1\|cif\)\[\][ ]=' drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
+    defsnc '[\t]static[ ]const[ ]struct[ ]rate_s[ ]rate_1\[\][ ]=' drivers/media/usb/gspca/ov534.c
+    defsnc 'static[ ]struct[ ]serdes_cfg[ ]cfg_phyb_10p3125g_\(156p25mhz_cmu1\|16bit_lane\|comlane\)\[\][ ]=' drivers/net/ethernet/ti/netcp_xgbepcsr.c
+    defsnc 'static[ ]const[ ]u32[ ]qca956x_1p0_\(baseband\|radio\)_core\[\]\[2\][ ]=' drivers/net/wireless/ath/ath9k/ar956x_initvals.h
+    defsnc 'static[ ]const[ ]u32[ ]qca956x_1p0_\(baseband\|radio\)_postamble\[\]\[5\][ ]=' drivers/net/wireless/ath/ath9k/ar956x_initvals.h
+    defsnc 'static[ ]const[ ]u32[ ]qca956x_1p0_modes_\(no_\)\?xpa_\(low_ob_db_\|green_\)\?tx_gain_table\[\]\[3\][ ]=' drivers/net/wireless/ath/ath9k/ar956x_initvals.h
+    defsnc 'static[ ]const[ ]u32[ ]qca956x_1p0_common_rx_gain_table\[\]\[2\][ ]=' drivers/net/wireless/ath/ath9k/ar956x_initvals.h
+    defsnc 'static[ ]const[ ]u32[ ]qca956x_1p0_xlna_only\[\]\[5\][ ]=' drivers/net/wireless/ath/ath9k/ar956x_initvals.h
+    defsnc 'static[ ]const[ ]unsigned[ ]int[ ]smc0_nor_pins\[\][ ]=' drivers/pinctrl/pinctrl-zynq.c
+    defsnc 'static[ ]const[ ]unsigned[ ]char[ ]gamma_correction_table\[\][ ]=' drivers/staging/fbtft/fb_agm1264k-fl.c
+    defsnc '[\t]write_reg[(]par[,][ ]0x2D[,]' drivers/staging/fbtft/fb_hx8353d.c
+    defsnc '[#]define[ ]DEFAULT_GAMMA' 'drivers/staging/fbtft/fb_ssd13[35]1\.c'
+    defsnc 'static[ ]struct[ ]fbtft_device_display[ ]displays\[\][ ]=' drivers/staging/fbtft/fbtft_device.c
+    defsnc 'struct[ ]ModeInit[ ]vgamode\[\][ ]=' drivers/staging/sm7xxfb/sm7xx.h
+    defsnc 'static[ ]const[ ]u8[ ]\(\(priv\|pub\)_[ab]\|dhkey\)_[123]\[\(32\|64\)\][ ]__initconst[ ]=' net/bluetooth/selftest.c
+    defsnc '[\t]const[ ]u8[ ][uvw]\[32\][ ]=' net/bluetooth/smp.c
+    defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]wm8995_reg_defaults\[\][ ]=' sound/soc/codecs/wm8995.c
+
+    # CYAPA_FW_NAME, defined to this string, is not used anywhere, and
+    # firmware requests are issued with user-supplied names.  So,
+    # deblob the unused name, but keep the request active.
+    blobname 'cyapa\.bin' drivers/input/mouse/cyapa.c
+    accept 'static[ ]int[ ]cyapa_firmware[(]struct[ ]cyapa[ ][*]cyapa[,][ ]const[ ]char[ ][*]fw_name[)][\n][{][\n]\(\([^}\n][^\n]*\)\?[\n]\)*[\t]error[ ]=[ ]request_firmware[(][&]fw[,][ ]fw_name[,][ ]dev[)][;]' drivers/input/mouse/cyapa.c
+
+    # There are blob names here, but no apparent load mechanism.
+    blobname 'ssp_B2\.fw' drivers/iio/common/ssp_sensors/ssp_dev.c
+    blobname 'ssp_crashed\.fw' drivers/iio/common/ssp_sensors/ssp_dev.c
+    blobname 'thermostat_B2\.fw' drivers/iio/common/ssp_sensors/ssp_dev.c
     ;;
 
   */*freedo*.patch | */*logo*.patch)
diff --git a/resources/utilities/coreboot-libre/nonblobs b/resources/utilities/coreboot-libre/nonblobs
index 3a7e3feb..e8bb6af7 100644
--- a/resources/utilities/coreboot-libre/nonblobs
+++ b/resources/utilities/coreboot-libre/nonblobs
@@ -243,14 +243,16 @@
 ./src/mainboard/google/bolt/elpida_4Gb_1600_x16.spd.hex
 ./src/mainboard/google/peppy/Hynix_HMT425S6AFR6A.spd.hex
 ./src/mainboard/google/peppy/Elpida_EDJ4216EFBG.spd.hex
-./src/mainboard/google/samus/spd/samsung_4Gb.spd.hex
-./src/mainboard/google/samus/spd/empty.spd.hex
-./src/mainboard/google/samus/spd/elpida_8Gb.spd.hex
-./src/mainboard/google/samus/spd/hynix_4Gb.spd.hex
-./src/mainboard/google/samus/spd/samsung_8Gb.spd.hex
-./src/mainboard/google/samus/spd/hynix_8Gb.spd.hex
-./src/mainboard/google/samus/spd/elpida_4Gb.spd.hex
 ./src/mainboard/google/falco/Samsung_M471B5674QH0.spd.hex
+./src/mainboard/google/samus/spd/empty.spd.hex
+./src/mainboard/google/samus/spd/elpida_4.spd.hex
+./src/mainboard/google/samus/spd/hynix_4.spd.hex
+./src/mainboard/google/samus/spd/elpida_16.spd.hex
+./src/mainboard/google/samus/spd/hynix_8.spd.hex
+./src/mainboard/google/samus/spd/hynix_16.spd.hex
+./src/mainboard/google/samus/spd/samsung_8.spd.hex
+./src/mainboard/google/samus/spd/elpida_8.spd.hex
+./src/mainboard/google/samus/spd/samsung_4.spd.hex
 ./src/northbridge/intel/nehalem/raminit_tables.c
 ./src/northbridge/intel/sandybridge/raminit_patterns.h
 ./src/southbridge/nvidia/mcp55/early_setup_ss.h
@@ -273,3 +275,4 @@
 ./src/northbridge/amd/pi/00630F01/Kconfig
 ./src/cpu/amd/microcode/microcode.c
 ./src/lib/tlcl_structures.h
+./util/rockchip/make_idb.py
-- 
cgit v1.2.3-70-g09d2