Merge with original repo

author: KoDDoS Mirror <mirror@koddos.net> 2018-07-27 19:16:01 +0700
committer: KoDDoS Mirror <mirror@koddos.net> 2018-07-27 19:16:01 +0700
commit: 4cf7c27e5dca04492495f1fc08256f57f86faf56 (patch)
tree: 8128850191e6ea0cc364f17ae73e9f705ad1ecdd /projects
parent: 59d7df676b7222b532c2acf4309b16d255a0808b (diff)
parent: fbe7031b606c5716b7bb87a069da05a0cf56fc12 (diff)
download: librebootfr-4cf7c27e5dca04492495f1fc08256f57f86faf56.tar.gz
librebootfr-4cf7c27e5dca04492495f1fc08256f57f86faf56.zip
120 files changed, 8459 insertions, 2655 deletions
diff --git a/projects/bucts/bucts b/projects/bucts/bucts
index a5feeabc..4eea684a 100644
--- a/projects/bucts/bucts
+++ b/projects/bucts/bucts
@@ -24,18 +24,6 @@ usage() {
 	project_usage_arguments "$project" "$@"
 }
 
-download() {
-	local repository="$project"
-
-	project_download_git "$project" "$repository" 'git://git.stuge.se/bucts.git' "$@"
-}
-
-download_check() {
-	local repository="$project"
-
-	project_download_check_git "$project" "$repository" "$@"
-}
-
 extract() {
 	local repository="$project"
 
@@ -95,14 +83,14 @@ release() {
 	local repository="$project"
 
 	project_release_install_archive "$project" "$TOOLS" "$@"
-	project_release_sources_git "$project" "$repository" "$@"
+	project_release_sources_archive_create "$project" "$@"
 }
 
 release_check() {
 	local repository="bucts"
 
 	project_release_install_archive_check "$project" "$TOOLS" "$@"
-	project_release_check_sources_git "$project" "$repository" "$@"
+	project_release_sources_archive_exists_check "$project" "$@"
 }
 
 clean() {
diff --git a/projects/bucts/configs/revision b/projects/bucts/configs/revision
index 1ac89ef2..ee153928 100644
--- a/projects/bucts/configs/revision
+++ b/projects/bucts/configs/revision
@@ -1 +1 @@
-dc27919d7a66a6e8685ce07c71aefa4f03ef7c07
+6fa9d52277a76a1bace7458d8ed91acf8c94c0c1
diff --git a/projects/bucts/configs/targets b/projects/bucts/configs/targets
deleted file mode 100644
index 915652d5..00000000
--- a/projects/bucts/configs/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-generic
-lenovobios
diff --git a/projects/bucts/patches/0001-Makefile-don-t-use-git.patch b/projects/bucts/patches/0001-Makefile-don-t-use-git.patch
deleted file mode 100644
index 9a0e719c..00000000
--- a/projects/bucts/patches/0001-Makefile-don-t-use-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 63312528ea81207865077ab2c75963e3660859f0 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Sat, 14 Feb 2015 00:56:43 +0000
-Subject: [PATCH] Makefile: don't use git
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 68541e6..b5f43d5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- CC:=gcc
- OBJ:=bucts.o
--VERSION:=$(shell git describe)
-+VERSION:=withoutgit
- 
- ifeq ($(shell uname), FreeBSD)
- 	CFLAGS = -I/usr/local/include
--- 
-1.9.1
-
diff --git a/projects/bucts/patches/staticlink.diff b/projects/bucts/patches/staticlink.diff
deleted file mode 100644
index 52da8cc8..00000000
--- a/projects/bucts/patches/staticlink.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 68541e6..b8579eb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,7 +10,7 @@ endif
- all: bucts
- 
- bucts: $(OBJ)
--	$(CC) -o $@ $(OBJ) $(LDFLAGS) -lpci
-+	$(CC) -o $@ $(OBJ) $(LDFLAGS) -lpci -lz -static
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c $<
diff --git a/projects/bucts/sources/Makefile b/projects/bucts/sources/Makefile
new file mode 100644
index 00000000..b5f43d5f
--- /dev/null
+++ b/projects/bucts/sources/Makefile
@@ -0,0 +1,20 @@
+CC:=gcc
+OBJ:=bucts.o
+VERSION:=withoutgit
+
+ifeq ($(shell uname), FreeBSD)
+	CFLAGS = -I/usr/local/include
+	LDFLAGS = -L/usr/local/lib
+endif
+
+all: bucts
+
+bucts: $(OBJ)
+	$(CC) -o $@ $(OBJ) $(LDFLAGS) -lpci
+
+%.o: %.c
+	$(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c $<
+
+.PHONY: clean
+clean:
+	rm -f bucts $(OBJ)
diff --git a/projects/bucts/sources/bucts.c b/projects/bucts/sources/bucts.c
new file mode 100644
index 00000000..16e82c7a
--- /dev/null
+++ b/projects/bucts/sources/bucts.c
@@ -0,0 +1,191 @@
+/* compile: gcc -s -o bucts bucts.c -lpci  or:  make
+ * run as root: ./bucts [0|1]
+ */
+/*
+ * Copyright (C) 2011 Peter Stuge <peter@stuge.se>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#if defined(__GLIBC__)
+#include <sys/io.h>
+#endif
+#include <pci/pci.h>
+
+#if defined (__sun) && (defined(__i386) || defined(__amd64))
+#define MEM_DEV "/dev/xsvc"
+#else
+#define MEM_DEV "/dev/mem"
+#endif
+
+static int fd_mem=-1;
+
+static void *sys_physmap(unsigned long phys_addr, size_t len) {
+  void *virt_addr = mmap(0, len, PROT_WRITE|PROT_READ, MAP_SHARED, fd_mem, (off_t)phys_addr);
+  return MAP_FAILED == virt_addr ? NULL : virt_addr;
+}
+
+static void physunmap(void *virt_addr, size_t len) {
+  if (!len) {
+    printf("Not unmapping zero size at %p\n", virt_addr);
+    return;
+  }
+  munmap(virt_addr, len);
+}
+
+static void *physmap(const char *descr, unsigned long phys_addr, size_t len) {
+  void *virt_addr;
+
+  if (!descr)
+    descr = "memory";
+
+  if (!len) {
+    printf("Not mapping %s, zero size at 0x%08lx.\n", descr, phys_addr);
+    return NULL;
+  }
+
+  if ((getpagesize() - 1) & len)
+    fprintf(stderr, "Unaligned size 0x%lx for %s at 0x%08lx!\n", (unsigned long)len, descr, phys_addr);
+
+  if ((getpagesize() - 1) & phys_addr)
+    fprintf(stderr, "Unaligned address 0x%08lx for %s!\n", phys_addr, descr);
+
+  virt_addr = sys_physmap(phys_addr, len);
+  if (!virt_addr) {
+    fprintf(stderr, "Error accessing 0x%lx bytes %s at 0x%08lx!\n", (unsigned long)len, descr, phys_addr);
+    perror("mmap(" MEM_DEV ")");
+    if (EINVAL == errno) {
+      fprintf(stderr, "\n");
+      fprintf(stderr, "In Linux this error can be caused by the CONFIG_NONPROMISC_DEVMEM (<2.6.27),\n");
+      fprintf(stderr, "CONFIG_STRICT_DEVMEM (>=2.6.27) and CONFIG_X86_PAT kernel options.\n");
+      fprintf(stderr, "Please check if either is enabled in your kernel before reporting a failure.\n");
+      fprintf(stderr, "You can override CONFIG_X86_PAT at boot with the nopat kernel parameter but\n");
+      fprintf(stderr, "disabling the other option unfortunately requires a kernel recompile. Sorry!\n");
+    }
+  }
+
+  return virt_addr;
+}
+
+int bucts(struct pci_dev *sb, int8_t newts) {
+  uint8_t buc, ts;
+  uint32_t rcba_addr;
+  volatile uint8_t *rcba;
+  const char *str[2]={
+    "128kb address range 0xFFFE0000-0xFFFFFFFF is untranslated",
+    "64kb address ranges at 0xFFFE0000 and 0xFFFF0000 are swapped"
+  };
+
+  switch (sb->device_id) {
+  case 0x27b9:
+    rcba_addr = pci_read_long(sb, 0xf0) & ~1;
+    break;
+  default:
+    fprintf(stderr, "Unsupported LPC bridge. Sorry.\n");
+    return 1;
+  }
+
+  rcba = physmap("RCBA", rcba_addr, 0x4000);
+  if (!rcba)
+    return 1;
+
+  buc = rcba[0x3414];
+  ts = buc & 1;
+  printf("Current BUC.TS=%d - %s\n", ts, str[ts]);
+
+  if (0 == newts || 1 == newts) {
+    if (ts == newts) {
+      printf("Not writing BUC register since TS is already correct.\n");
+      goto unmap;
+    }
+    buc &= ~1;
+    buc |= newts;
+    rcba[0x3414] = buc;
+    buc = rcba[0x3414];
+    ts = buc & 1;
+    printf("Updated BUC.TS=%d - %s\n", ts, str[ts]);
+  }
+
+unmap:
+  physunmap((void *)rcba, 0x4000);
+  return 0;
+}
+
+int main(int argc, const char *argv[], const char *envp[]) {
+  int ret;
+  char *endp;
+  int8_t newts = -1;
+  struct pci_access *pacc;
+  struct pci_dev *dev, *sb = NULL;
+#if defined(__FreeBSD__)
+  int io_fd;
+#endif
+
+  printf("bucts utility version '" VERSION "'\n");
+
+#if defined(__FreeBSD__)
+  if ((io_fd = open("/dev/io", O_RDWR)) < 0) {
+    perror("open(/dev/io)");
+#else
+  if (iopl(3)) {
+    perror("iopl");
+#endif
+    printf("You need to be root.\n");
+    return 1;
+  }
+
+  if (-1 == (fd_mem = open(MEM_DEV, O_RDWR|O_SYNC))) {
+    perror("Error: open(" MEM_DEV ")");
+    return 1;
+  }
+
+  pacc=pci_alloc();
+  pci_init(pacc);
+  pci_scan_bus(pacc);
+  for (dev=pacc->devices; dev && !sb; dev=dev->next) {
+    pci_fill_info(dev, PCI_FILL_IDENT|PCI_FILL_CLASS);
+    if (dev->vendor_id != 0x8086 || dev->device_class != 0x0601)
+      continue;
+    sb = dev;
+  }
+  if (!sb) {
+    fprintf(stderr, "Error: LPC bridge not found!\n");
+    return 1;
+  }
+
+  printf("Using LPC bridge %04x:%04x at %02x%02x:%02x.%02x\n", sb->vendor_id, sb->device_id, sb->domain, sb->bus, sb->dev, sb->func);
+
+  if (argc > 1) {
+    newts = strtoul(argv[1], &endp, 10);
+    if (endp == argv[1]) {
+      fprintf(stderr, "Invalid new TS value '%s', please specify 0 or 1.\n", argv[1]);
+      newts = -1;
+    }
+  }
+
+  ret = bucts(sb, newts);
+
+  close(fd_mem);
+  return ret;
+}
diff --git a/projects/coreboot/configs/revision b/projects/coreboot/configs/revision
index 8f14f42e..24940261 100644
--- a/projects/coreboot/configs/revision
+++ b/projects/coreboot/configs/revision
@@ -1 +1 @@
-a19d44d2764be4dba55cad96abea12d92c8e1f0d
+a17796e6012041e2d8ebe16b0bde0b99809ee87c
diff --git a/projects/coreboot/configs/seabios/d510mo/config b/projects/coreboot/configs/seabios/d510mo/config
index 168919ef..cf8d27f6 100644
--- a/projects/coreboot/configs/seabios/d510mo/config
+++ b/projects/coreboot/configs/seabios/d510mo/config
@@ -6,44 +6,37 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
+# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_USE_OPTION_TABLE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_EARLY_CBMEM_INIT is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-CONFIG_FLASHMAP_OFFSET=0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -57,16 +50,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -83,6 +78,7 @@ CONFIG_VENDOR_INTEL=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -94,6 +90,7 @@ CONFIG_VENDOR_INTEL=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -105,56 +102,75 @@ CONFIG_VENDOR_INTEL=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="intel/d510mo"
 CONFIG_MAINBOARD_PART_NUMBER="D510MO"
 CONFIG_MAINBOARD_VENDOR="Intel"
 CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x100000
 CONFIG_VGA_BIOS_ID="8086,a001"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_DCACHE_RAM_BASE=0xffafc000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x4000
-CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Intel"
+CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x100000
 CONFIG_POST_DEVICE=y
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP2 is not set
-# CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set
 # CONFIG_BOARD_INTEL_BASKING_RIDGE is not set
+# CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set
 # CONFIG_BOARD_INTEL_BAYLEYBAY_FSP is not set
+# CONFIG_BOARD_INTEL_CAMELBACKMOUNTAIN_FSP is not set
+# CONFIG_BOARD_INTEL_CANNONLAKE_RVPU is not set
+# CONFIG_BOARD_INTEL_CANNONLAKE_RVPY is not set
 # CONFIG_BOARD_INTEL_COUGAR_CANYON2 is not set
 CONFIG_BOARD_INTEL_D510MO=y
 # CONFIG_BOARD_INTEL_D810E2CB is not set
 # CONFIG_BOARD_INTEL_D945GCLF is not set
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
+# CONFIG_BOARD_INTEL_DG43GT is not set
 # CONFIG_BOARD_INTEL_EAGLEHEIGHTS is not set
 # CONFIG_BOARD_INTEL_EMERALDLAKE2 is not set
 # CONFIG_BOARD_INTEL_GALILEO is not set
+# CONFIG_BOARD_INTEL_GLKRVP is not set
+# CONFIG_BOARD_INTEL_HARCUVAR is not set
+# CONFIG_BOARD_INTEL_KBLRVP3 is not set
+# CONFIG_BOARD_INTEL_KBLRVP7 is not set
 # CONFIG_BOARD_INTEL_KUNIMITSU is not set
+# CONFIG_BOARD_INTEL_LEAFHILL is not set
 # CONFIG_BOARD_INTEL_LITTLEPLAINS is not set
+# CONFIG_BOARD_INTEL_MINNOW3 is not set
 # CONFIG_BOARD_INTEL_MINNOWMAX is not set
 # CONFIG_BOARD_INTEL_MOHONPEAK is not set
 # CONFIG_BOARD_INTEL_MTARVON is not set
+# CONFIG_BOARD_INTEL_SKLSDLBRK is not set
 # CONFIG_BOARD_INTEL_STARGO2 is not set
 # CONFIG_BOARD_INTEL_STRAGO is not set
 # CONFIG_BOARD_INTEL_TRUXTON is not set
 # CONFIG_BOARD_INTEL_WTM2 is not set
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
+# CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
 CONFIG_CPU_ADDR_BITS=32
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -165,11 +181,14 @@ CONFIG_COREBOOT_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=1024
 CONFIG_ROM_SIZE=0x100000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -180,20 +199,37 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/pineview/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0x4000
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -213,25 +249,30 @@ CONFIG_CPU_INTEL_SOCKET_FCBGA559=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 CONFIG_SERIALIZED_SMM_INITIALIZATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -246,15 +287,14 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_PINEVIEW=y
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -264,12 +304,18 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE=y
 CONFIG_SUPERIO_WINBOND_W83627THG=y
 
@@ -277,7 +323,10 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
 # Embedded Controllers
 #
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -293,6 +342,10 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -331,108 +384,159 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_SIPI_VECTOR_IN_ROM=y
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
-CONFIG_LATE_CBMEM_INIT=y
+# CONFIG_CBMEM_TOP_BACKUP is not set
+# CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
-# CONFIG_HAVE_CMOS_DEFAULT is not set
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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
+# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
+# CONFIG_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+CONFIG_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
+# CONFIG_SPI_FLASH_SMM is not set
+# CONFIG_SPI_FLASH_NO_FAST_READ is not set
+CONFIG_SPI_FLASH_ADESTO=y
+CONFIG_SPI_FLASH_AMIC=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+CONFIG_DRIVERS_I2C_CK505=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
-# CONFIG_INTEL_GMA_ACPI is not set
+CONFIG_INTEL_GMA_ACPI=y
+# CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -449,7 +553,10 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HAVE_ACPI_RESUME is not set
+CONFIG_HWBASE_DEBUG_CB=y
+CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
+CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
@@ -457,13 +564,12 @@ CONFIG_HAVE_HARD_RESET=y
 CONFIG_HAVE_MONOTONIC_TIMER=y
 # CONFIG_GENERIC_UDELAY is not set
 # CONFIG_TIMER_QUEUE is not set
-# CONFIG_HAVE_OPTION_TABLE is not set
+CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
@@ -475,13 +581,13 @@ CONFIG_COMMON_FADT=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -490,10 +596,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -503,19 +616,28 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/d510mo/revision b/projects/coreboot/configs/seabios/d510mo/revision
deleted file mode 100644
index 1ab8299e..00000000
--- a/projects/coreboot/configs/seabios/d510mo/revision
+++ /dev/null
@@ -1 +0,0 @@
-2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/projects/coreboot/configs/seabios/d945gclf/config b/projects/coreboot/configs/seabios/d945gclf/config
index 2cb14518..1f2d39b7 100644
--- a/projects/coreboot/configs/seabios/d945gclf/config
+++ b/projects/coreboot/configs/seabios/d945gclf/config
@@ -6,6 +6,7 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
@@ -13,37 +14,26 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 # CONFIG_STATIC_OPTION_TABLE is not set
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-CONFIG_DEVICETREE="devicetree.cb"
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -61,16 +51,18 @@ CONFIG_DEVICETREE="devicetree.cb"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -87,6 +79,7 @@ CONFIG_VENDOR_INTEL=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -98,6 +91,7 @@ CONFIG_VENDOR_INTEL=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -109,6 +103,7 @@ CONFIG_VENDOR_INTEL=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="intel/d945gclf"
@@ -116,60 +111,70 @@ CONFIG_MAINBOARD_PART_NUMBER="D945GCLF"
 CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="Intel"
 CONFIG_MAX_CPUS=4
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x80000
 CONFIG_UART_FOR_CONSOLE=0
-CONFIG_VGA_BIOS_ID="8086,27a2"
+CONFIG_VGA_BIOS_ID="8086,2772"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-# CONFIG_HAS_LVDS is not set
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Intel"
+CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
-# CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_POST_DEVICE=y
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_TTYS0_LCS=3
-# CONFIG_BOARD_INTEL_AMENIA is not set
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
 # CONFIG_BOARD_INTEL_APOLLOLAKE_RVP2 is not set
-# CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set
 # CONFIG_BOARD_INTEL_BASKING_RIDGE is not set
+# CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set
 # CONFIG_BOARD_INTEL_BAYLEYBAY_FSP is not set
 # CONFIG_BOARD_INTEL_CAMELBACKMOUNTAIN_FSP is not set
+# CONFIG_BOARD_INTEL_CANNONLAKE_RVPU is not set
+# CONFIG_BOARD_INTEL_CANNONLAKE_RVPY is not set
 # CONFIG_BOARD_INTEL_COUGAR_CANYON2 is not set
 # CONFIG_BOARD_INTEL_D510MO is not set
 # CONFIG_BOARD_INTEL_D810E2CB is not set
 CONFIG_BOARD_INTEL_D945GCLF=y
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
+# CONFIG_BOARD_INTEL_DG43GT is not set
 # CONFIG_BOARD_INTEL_EAGLEHEIGHTS is not set
 # CONFIG_BOARD_INTEL_EMERALDLAKE2 is not set
 # CONFIG_BOARD_INTEL_GALILEO is not set
+# CONFIG_BOARD_INTEL_GLKRVP is not set
+# CONFIG_BOARD_INTEL_HARCUVAR is not set
+# CONFIG_BOARD_INTEL_KBLRVP3 is not set
+# CONFIG_BOARD_INTEL_KBLRVP7 is not set
 # CONFIG_BOARD_INTEL_KUNIMITSU is not set
+# CONFIG_BOARD_INTEL_LEAFHILL is not set
 # CONFIG_BOARD_INTEL_LITTLEPLAINS is not set
+# CONFIG_BOARD_INTEL_MINNOW3 is not set
 # CONFIG_BOARD_INTEL_MINNOWMAX is not set
 # CONFIG_BOARD_INTEL_MOHONPEAK is not set
 # CONFIG_BOARD_INTEL_MTARVON is not set
+# CONFIG_BOARD_INTEL_SKLSDLBRK is not set
 # CONFIG_BOARD_INTEL_STARGO2 is not set
 # CONFIG_BOARD_INTEL_STRAGO is not set
 # CONFIG_BOARD_INTEL_TRUXTON is not set
 # CONFIG_BOARD_INTEL_WTM2 is not set
-# CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
+# CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
 CONFIG_CPU_ADDR_BITS=32
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_512=y
@@ -181,13 +186,13 @@ CONFIG_COREBOOT_ROMSIZE_KB_512=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=512
 CONFIG_ROM_SIZE=0x80000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -199,22 +204,32 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
+CONFIG_TTYS0_BAUD=115200
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
@@ -241,6 +256,9 @@ CONFIG_SSE2=y
 CONFIG_CPU_INTEL_SOCKET_441=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
@@ -261,6 +279,7 @@ CONFIG_SERIALIZED_SMM_INITIALIZATION=y
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -275,19 +294,19 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM is not set
+# CONFIG_I945_LVDS is not set
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-CONFIG_CHECK_SLFRCS_ON_RESUME=y
+# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_MAX_PIRQ_LINKS=4
 
@@ -298,22 +317,25 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 CONFIG_SUPERIO_SMSC_LPC47M15X=y
 
 #
 # Embedded Controllers
 #
-CONFIG_VBOOT_VBNV_OFFSET=0x26
-# CONFIG_VBOOT_VBNV_CMOS is not set
-# CONFIG_VBOOT_VBNV_EC is not set
-# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
 # CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
@@ -332,6 +354,10 @@ CONFIG_VBOOT_VBNV_OFFSET=0x26
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -371,58 +397,82 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_SIPI_VECTOR_IN_ROM=y
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
-# CONFIG_HAVE_CMOS_DEFAULT is not set
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
-# CONFIG_REALTEK_8168_RESET is not set
-# CONFIG_SPI_FLASH is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+CONFIG_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
+# CONFIG_SPI_FLASH_SMM is not set
+# CONFIG_SPI_FLASH_NO_FAST_READ is not set
+CONFIG_SPI_FLASH_ADESTO=y
+CONFIG_SPI_FLASH_AMIC=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -434,39 +484,59 @@ CONFIG_DRIVERS_UART=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 # CONFIG_INTEL_INT15 is not set
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
 CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
 # CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -489,10 +559,10 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -503,12 +573,15 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
@@ -523,7 +596,6 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -537,7 +609,6 @@ CONFIG_COMMON_FADT=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
 
 #
 # Payload
@@ -552,9 +623,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
@@ -578,16 +646,18 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
 # CONFIG_DEBUG_PIRQ is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -596,3 +666,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/d945gclf/revision b/projects/coreboot/configs/seabios/d945gclf/revision
deleted file mode 100644
index f6e726f0..00000000
--- a/projects/coreboot/configs/seabios/d945gclf/revision
+++ /dev/null
@@ -1 +0,0 @@
-36d405268f040208cd26902f3c0b5346f7d4d25b
diff --git a/projects/coreboot/configs/seabios/ga-g41m-es2l/config b/projects/coreboot/configs/seabios/ga-g41m-es2l/config
index 196aea73..237f6daa 100644
--- a/projects/coreboot/configs/seabios/ga-g41m-es2l/config
+++ b/projects/coreboot/configs/seabios/ga-g41m-es2l/config
@@ -6,42 +6,33 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
+# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_USE_OPTION_TABLE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -59,16 +50,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 CONFIG_VENDOR_GIGABYTE=y
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -85,6 +78,7 @@ CONFIG_VENDOR_GIGABYTE=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -96,6 +90,7 @@ CONFIG_VENDOR_GIGABYTE=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -107,29 +102,33 @@ CONFIG_VENDOR_GIGABYTE=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="gigabyte/ga-g41m-es2l"
 CONFIG_MAINBOARD_PART_NUMBER="GA-G41M-ES2L"
 CONFIG_MAINBOARD_VENDOR="GIGABYTE"
-CONFIG_MAX_CPUS=1
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x100000
 CONFIG_VGA_BIOS_ID="8086,2e32"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xfeffc000
 CONFIG_DCACHE_RAM_SIZE=0x4000
-CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="GIGABYTE"
+CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_GIGABYTE_GA_6BXC is not set
 # CONFIG_BOARD_GIGABYTE_GA_6BXE is not set
+# CONFIG_BOARD_GIGABYTE_GA_945GCM_S2L is not set
+# CONFIG_BOARD_GIGABYTE_GA_945GCM_S2C is not set
 # CONFIG_BOARD_GIGABYTE_GA_B75M_D3H is not set
 # CONFIG_BOARD_GIGABYTE_GA_B75M_D3V is not set
 CONFIG_BOARD_GIGABYTE_GA_G41M_ES2L=y
@@ -138,13 +137,18 @@ CONFIG_BOARD_GIGABYTE_GA_G41M_ES2L=y
 # CONFIG_BOARD_GIGABYTE_MA785GM is not set
 # CONFIG_BOARD_GIGABYTE_MA785GMT is not set
 # CONFIG_BOARD_GIGABYTE_MA78GM is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="GA-G41M-ES2L"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -155,13 +159,13 @@ CONFIG_COREBOOT_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=1024
 CONFIG_ROM_SIZE=0x100000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -173,24 +177,32 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+CONFIG_PCIEXP_ASPM=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+CONFIG_PCIEXP_CLK_PM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/x4x/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -210,7 +222,6 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-CONFIG_CPU_INTEL_MODEL_6EX=y
 CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
 CONFIG_CPU_INTEL_MODEL_F3X=y
@@ -219,12 +230,15 @@ CONFIG_SSE2=y
 CONFIG_CPU_INTEL_SOCKET_LGA775=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
-# CONFIG_LAPIC_MONOTONIC_TIMER is not set
+CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
@@ -237,7 +251,9 @@ CONFIG_LOGICAL_CPUS=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -252,11 +268,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_X4X=y
@@ -270,20 +285,31 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_ITE_COMMON_ROMSTAGE=y
+CONFIG_SUPERIO_ITE_ENV_CTRL=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG=y
+CONFIG_SUPERIO_ITE_ENV_CTRL_PWM_FREQ2=y
 CONFIG_SUPERIO_ITE_IT8718F=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -300,6 +326,10 @@ CONFIG_SUPERIO_ITE_IT8718F=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,58 +369,86 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_SIPI_VECTOR_IN_ROM=y
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
-# CONFIG_HAVE_CMOS_DEFAULT is not set
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
-# CONFIG_ON_DEVICE_ROM_LOAD is not set
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-CONFIG_PCIEXP_ASPM=y
-CONFIG_PCIEXP_CLK_PM=y
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 CONFIG_REALTEK_8168_RESET=y
-# CONFIG_SPI_FLASH is not set
+CONFIG_REALTEK_8168_MACADDRESS="00:4c:69:62:72:65"
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+CONFIG_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
+# CONFIG_SPI_FLASH_SMM is not set
+# CONFIG_SPI_FLASH_NO_FAST_READ is not set
+CONFIG_SPI_FLASH_ADESTO=y
+CONFIG_SPI_FLASH_AMIC=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -402,53 +460,70 @@ CONFIG_REALTEK_8168_RESET=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 # CONFIG_INTEL_INT15 is not set
 CONFIG_INTEL_GMA_ACPI=y
+# CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -459,24 +534,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HAVE_ACPI_RESUME is not set
+CONFIG_HWBASE_DEBUG_CB=y
+CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
+CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
-# CONFIG_HAVE_OPTION_TABLE is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
+CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
@@ -488,13 +568,13 @@ CONFIG_COMMON_FADT=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="GA-G41M-ES2L"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -523,16 +603,18 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -541,3 +623,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/ga-g41m-es2l/revision b/projects/coreboot/configs/seabios/ga-g41m-es2l/revision
deleted file mode 100644
index e785a260..00000000
--- a/projects/coreboot/configs/seabios/ga-g41m-es2l/revision
+++ /dev/null
@@ -1 +0,0 @@
-7c2e5396a3d47c64eb5a553fe412aad4c0f8dc1b
diff --git a/projects/coreboot/configs/seabios/kcma-d8/config b/projects/coreboot/configs/seabios/kcma-d8/config
index 3ae9245a..8b78ab25 100644
--- a/projects/coreboot/configs/seabios/kcma-d8/config
+++ b/projects/coreboot/configs/seabios/kcma-d8/config
@@ -6,46 +6,38 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
+# CONFIG_UBSAN is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -59,16 +51,18 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -85,6 +79,7 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -96,6 +91,7 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -107,32 +103,37 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="asus/kcma-d8"
 CONFIG_MAINBOARD_PART_NUMBER="KCMA-D8"
 CONFIG_IRQ_SLOT_COUNT=13
 CONFIG_MAINBOARD_VENDOR="ASUS"
-CONFIG_APIC_ID_OFFSET=0
-CONFIG_HW_MEM_HOLE_SIZEK=0x100000
 CONFIG_MAX_CPUS=16
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x200000
+CONFIG_APIC_ID_OFFSET=0x0
+CONFIG_HW_MEM_HOLE_SIZEK=0x100000
 CONFIG_MAX_PHYSICAL_CPUS=2
 # CONFIG_HW_MEM_HOLE_SIZE_AUTO_INC is not set
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
-CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_A8N_E is not set
 # CONFIG_BOARD_ASUS_A8N_SLI is not set
 # CONFIG_BOARD_ASUS_A8V_E_DELUXE is not set
 # CONFIG_BOARD_ASUS_A8V_E_SE is not set
+# CONFIG_BOARD_ASUS_AM1I_A is not set
 # CONFIG_BOARD_ASUS_DSBF is not set
 # CONFIG_BOARD_ASUS_F2A85_M is not set
+# CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
 # CONFIG_BOARD_ASUS_F2A85_M_LE is not set
 # CONFIG_BOARD_ASUS_K8V_X is not set
 CONFIG_BOARD_ASUS_KCMA_D8=y
@@ -154,26 +155,30 @@ CONFIG_BOARD_ASUS_KCMA_D8=y
 # CONFIG_BOARD_ASUS_P2B_LS is not set
 # CONFIG_BOARD_ASUS_P2B is not set
 # CONFIG_BOARD_ASUS_P3B_F is not set
+# CONFIG_BOARD_ASUS_P5GC_MX is not set
+CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 # CONFIG_POST_IO is not set
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_AGP_APERTURE_SIZE=0x4000000
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kcma-d8/bootblock.c"
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_MAX_REBOOT_CNT=10
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x400000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 # CONFIG_POST_DEVICE is not set
-CONFIG_BOOT_MEDIA_SPI_BUS=0
-CONFIG_CONSOLE_POST=y
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -184,11 +189,14 @@ CONFIG_BOARD_ROMSIZE_KB_2048=y
 CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -199,22 +207,36 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
-# CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_RAMTOP=0x400000
+CONFIG_HEAP_SIZE=0xc0000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+# CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+CONFIG_PCIEXP_ASPM=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_PCIEXP_CLK_PM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0xc0000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x14
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
@@ -263,15 +285,17 @@ CONFIG_UDELAY_LAPIC=y
 # CONFIG_UDELAY_TIMER2 is not set
 CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_SSE=y
@@ -285,7 +309,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-CONFIG_MMCONF_BUS_NUMBER=256
 CONFIG_NORTHBRIDGE_AMD_AMDFAM10=y
 CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY=y
 # CONFIG_HT_CHAIN_DISTRIBUTE is not set
@@ -303,14 +326,12 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y
 CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
 # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
 CONFIG_LIMIT_HT_UP_WIDTH_16=y
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x14
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -321,16 +342,23 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_AMD_SB700=y
 CONFIG_SOUTHBRIDGE_SPECIFIC_OPTIONS=y
+CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
 CONFIG_SOUTHBRIDGE_AMD_SUBTYPE_SP5100=y
 # CONFIG_SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT is not set
 CONFIG_SOUTHBRIDGE_AMD_SB700_DISABLE_ISA_DMA=y
 CONFIG_SOUTHBRIDGE_AMD_SR5650=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE=y
 CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 
@@ -338,7 +366,9 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 # Embedded Controllers
 #
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -355,6 +385,10 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -394,37 +428,40 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_VERSTAGE_ADDR=0x2000000
 # CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-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_LOAD=y
+CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 CONFIG_SMBUS_HAS_AUX_CHANNELS=y
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_PCIEXP_ASPM=y
-CONFIG_PCIEXP_CLK_PM=y
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_SOFTWARE_I2C is not set
@@ -433,13 +470,14 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_ELOG is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SPI_ATOMIC_SEQUENCING=y
-CONFIG_SPI_FLASH_MEMORY_MAPPED=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
 # CONFIG_SPI_FLASH_NO_FAST_READ is not set
 CONFIG_SPI_FLASH_ADESTO=y
 CONFIG_SPI_FLASH_AMIC=y
@@ -452,63 +490,88 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
-CONFIG_DEVICE_SPECIFIC_OPTIONS=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 CONFIG_DRIVERS_I2C_W83795=y
-# CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 # CONFIG_INTEL_GMA_ACPI is not set
+# CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
+# CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -519,8 +582,11 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+CONFIG_CONSOLE_POST=y
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+CONFIG_ACPI_HUGE_LOWMEM_BACKUP=y
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK=y
@@ -535,7 +601,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_PCI_IO_CFG_EXT=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -549,13 +614,13 @@ CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -564,6 +629,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 
@@ -573,6 +639,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 # CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -590,13 +657,19 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 CONFIG_ENABLE_APIC_EXT_ID=y
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/kcma-d8/revision b/projects/coreboot/configs/seabios/kcma-d8/revision
deleted file mode 100644
index a4c248f2..00000000
--- a/projects/coreboot/configs/seabios/kcma-d8/revision
+++ /dev/null
@@ -1 +0,0 @@
-eee0e229764e965996479d7eb07e6086176b8bf0
diff --git a/projects/coreboot/configs/seabios/kfsn4-dre/config b/projects/coreboot/configs/seabios/kfsn4-dre/config
index f554fbfb..e4435801 100644
--- a/projects/coreboot/configs/seabios/kfsn4-dre/config
+++ b/projects/coreboot/configs/seabios/kfsn4-dre/config
@@ -6,46 +6,38 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
+# CONFIG_UBSAN is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -59,16 +51,18 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -85,6 +79,7 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -96,6 +91,7 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -107,32 +103,38 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="asus/kfsn4-dre"
 CONFIG_MAINBOARD_PART_NUMBER="KFSN4-DRE"
 CONFIG_IRQ_SLOT_COUNT=13
 CONFIG_MAINBOARD_VENDOR="ASUS"
-CONFIG_APIC_ID_OFFSET=0
-CONFIG_HW_MEM_HOLE_SIZEK=0x100000
 CONFIG_MAX_CPUS=12
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x100000
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_APIC_ID_OFFSET=0x0
+CONFIG_HW_MEM_HOLE_SIZEK=0x100000
 CONFIG_MAX_PHYSICAL_CPUS=2
 # CONFIG_HW_MEM_HOLE_SIZE_AUTO_INC is not set
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xc4000
 CONFIG_DCACHE_RAM_SIZE=0x0c000
-CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_A8N_E is not set
 # CONFIG_BOARD_ASUS_A8N_SLI is not set
 # CONFIG_BOARD_ASUS_A8V_E_DELUXE is not set
 # CONFIG_BOARD_ASUS_A8V_E_SE is not set
+# CONFIG_BOARD_ASUS_AM1I_A is not set
 # CONFIG_BOARD_ASUS_DSBF is not set
 # CONFIG_BOARD_ASUS_F2A85_M is not set
+# CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
 # CONFIG_BOARD_ASUS_F2A85_M_LE is not set
 # CONFIG_BOARD_ASUS_K8V_X is not set
 # CONFIG_BOARD_ASUS_KCMA_D8 is not set
@@ -154,29 +156,32 @@ CONFIG_BOARD_ASUS_KFSN4_DRE=y
 # CONFIG_BOARD_ASUS_P2B_LS is not set
 # CONFIG_BOARD_ASUS_P2B is not set
 # CONFIG_BOARD_ASUS_P3B_F is not set
+# CONFIG_BOARD_ASUS_P5GC_MX is not set
+CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_AGP_APERTURE_SIZE=0x4000000
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kfsn4-dre/bootblock.c"
 CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_MAX_REBOOT_CNT=10
 CONFIG_CK804_PCI_E_X=1
 CONFIG_CK804_PCIE_PME_WAKE=y
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
+CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x400000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x100000
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=0
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_TTYS0_LCS=3
+CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KFSN4-DRE"
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
-CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
 CONFIG_CK804_NUM=1
 CONFIG_BOARD_ROMSIZE_KB_1024=y
@@ -188,11 +193,14 @@ CONFIG_COREBOOT_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=1024
 CONFIG_ROM_SIZE=0x100000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -203,24 +211,40 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
-# CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_RAMTOP=0x400000
+CONFIG_HEAP_SIZE=0xc0000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+# CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_PCIEXP_ASPM=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_PCIEXP_CLK_PM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/nvidia/ck804/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0xc0000
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0xfa
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
+CONFIG_TTYS0_BAUD=115200
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -263,15 +287,17 @@ CONFIG_UDELAY_LAPIC=y
 # CONFIG_UDELAY_TIMER2 is not set
 CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_SSE=y
@@ -285,7 +311,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-CONFIG_MMCONF_BUS_NUMBER=256
 CONFIG_NORTHBRIDGE_AMD_AMDFAM10=y
 # CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY is not set
 # CONFIG_HT_CHAIN_DISTRIBUTE is not set
@@ -303,14 +328,12 @@ CONFIG_DIMM_REGISTERED=y
 CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
 # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
 CONFIG_LIMIT_HT_UP_WIDTH_16=y
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0xfa
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -321,6 +344,11 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_NVIDIA_CK804=y
 # CONFIG_CK804_USE_NIC is not set
 # CONFIG_CK804_USE_ACI is not set
@@ -329,6 +357,7 @@ CONFIG_CK804B_PCI_E_X=4
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE=y
 CONFIG_SUPERIO_WINBOND_W83627THG=y
 
@@ -336,7 +365,10 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
 # Embedded Controllers
 #
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -352,6 +384,10 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -391,100 +427,140 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_NATIVE_VGA_INIT_USE_EDID is not set
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_PCIEXP_ASPM=y
-CONFIG_PCIEXP_CLK_PM=y
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
-# CONFIG_PXE_ROM is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
-CONFIG_DEVICE_SPECIFIC_OPTIONS=y
 # CONFIG_GIC is not set
-# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
-# CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_I2C_W83793=y
-# CONFIG_INTEL_DP is not set
-# CONFIG_INTEL_DDI is not set
-# CONFIG_INTEL_EDID is not set
-# CONFIG_INTEL_INT15 is not set
-# CONFIG_INTEL_GMA_ACPI is not set
-# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
-CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 CONFIG_DRIVERS_UART=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 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=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 # CONFIG_USBDEBUG_DONGLE_FTDI_FT232H is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
+# CONFIG_DRIVERS_AMD_PI is not set
+# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
+# CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
+CONFIG_DRIVERS_I2C_W83793=y
+# CONFIG_INTEL_DDI is not set
+# CONFIG_INTEL_EDID is not set
+# CONFIG_INTEL_INT15 is not set
+# CONFIG_INTEL_GMA_ACPI is not set
+# CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
+# CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
+# CONFIG_DRIVER_MAXIM_MAX77686 is not set
+# CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
+CONFIG_DRIVERS_MC146818=y
+# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
+# CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
+# CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
+# CONFIG_DRIVER_TI_TPS65090 is not set
+# CONFIG_DRIVERS_TI_TPS65913 is not set
+# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 CONFIG_DRIVERS_XGI_Z79_COMMON=y
 CONFIG_DRIVERS_XGI_Z9S=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -507,12 +583,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -529,7 +604,9 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 # CONFIG_HAVE_ACPI_RESUME is not set
+CONFIG_ACPI_HUGE_LOWMEM_BACKUP=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
@@ -543,7 +620,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_PCI_IO_CFG_EXT=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -557,13 +633,13 @@ CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KFSN4-DRE"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -572,6 +648,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 
@@ -580,6 +657,8 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 #
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -598,13 +677,20 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
+CONFIG_NO_EDID_FILL_FB=y
 CONFIG_ENABLE_APIC_EXT_ID=y
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/kfsn4-dre/revision b/projects/coreboot/configs/seabios/kfsn4-dre/revision
deleted file mode 100644
index fabe7537..00000000
--- a/projects/coreboot/configs/seabios/kfsn4-dre/revision
+++ /dev/null
@@ -1 +0,0 @@
-15fca66bf08db45937ce88b950491963654805b9
diff --git a/projects/coreboot/configs/seabios/kgpe-d16/config b/projects/coreboot/configs/seabios/kgpe-d16/config
index db0ab7f1..7a2eca9c 100644
--- a/projects/coreboot/configs/seabios/kgpe-d16/config
+++ b/projects/coreboot/configs/seabios/kgpe-d16/config
@@ -6,46 +6,38 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
+# CONFIG_UBSAN is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -59,16 +51,18 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -85,6 +79,7 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -96,6 +91,7 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -107,32 +103,38 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="asus/kgpe-d16"
 CONFIG_MAINBOARD_PART_NUMBER="KGPE-D16"
 CONFIG_IRQ_SLOT_COUNT=13
 CONFIG_MAINBOARD_VENDOR="ASUS"
-CONFIG_APIC_ID_OFFSET=0
-CONFIG_HW_MEM_HOLE_SIZEK=0x100000
 CONFIG_MAX_CPUS=32
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x200000
+CONFIG_APIC_ID_OFFSET=0x0
+CONFIG_HW_MEM_HOLE_SIZEK=0x100000
 CONFIG_MAX_PHYSICAL_CPUS=4
 # CONFIG_HW_MEM_HOLE_SIZE_AUTO_INC is not set
 CONFIG_HT_CHAIN_END_UNITID_BASE=0x20
 CONFIG_HT_CHAIN_UNITID_BASE=0x0
+CONFIG_VGA_BIOS_ID="1a03,2000"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xc2000
 CONFIG_DCACHE_RAM_SIZE=0x1e000
-CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_A8N_E is not set
 # CONFIG_BOARD_ASUS_A8N_SLI is not set
 # CONFIG_BOARD_ASUS_A8V_E_DELUXE is not set
 # CONFIG_BOARD_ASUS_A8V_E_SE is not set
+# CONFIG_BOARD_ASUS_AM1I_A is not set
 # CONFIG_BOARD_ASUS_DSBF is not set
 # CONFIG_BOARD_ASUS_F2A85_M is not set
+# CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
 # CONFIG_BOARD_ASUS_F2A85_M_LE is not set
 # CONFIG_BOARD_ASUS_K8V_X is not set
 # CONFIG_BOARD_ASUS_KCMA_D8 is not set
@@ -154,26 +156,30 @@ CONFIG_BOARD_ASUS_KGPE_D16=y
 # CONFIG_BOARD_ASUS_P2B_LS is not set
 # CONFIG_BOARD_ASUS_P2B is not set
 # CONFIG_BOARD_ASUS_P3B_F is not set
+# CONFIG_BOARD_ASUS_P5GC_MX is not set
+CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 # CONFIG_POST_IO is not set
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_AGP_APERTURE_SIZE=0x4000000
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kgpe-d16/bootblock.c"
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
 CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_MAX_REBOOT_CNT=10
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x400000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 # CONFIG_POST_DEVICE is not set
-CONFIG_BOOT_MEDIA_SPI_BUS=0
-CONFIG_CONSOLE_POST=y
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_PCIEXP_L1_SUB_STATE=y
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -184,11 +190,14 @@ CONFIG_BOARD_ROMSIZE_KB_2048=y
 CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -199,22 +208,36 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
-# CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_RAMTOP=0x400000
+CONFIG_HEAP_SIZE=0xc0000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+# CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+CONFIG_PCIEXP_ASPM=y
+CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_PCIEXP_CLK_PM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0xc0000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x14
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
@@ -263,15 +286,17 @@ CONFIG_UDELAY_LAPIC=y
 # CONFIG_UDELAY_TIMER2 is not set
 CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_SSE=y
@@ -285,7 +310,6 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-CONFIG_MMCONF_BUS_NUMBER=256
 CONFIG_NORTHBRIDGE_AMD_AMDFAM10=y
 CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY=y
 # CONFIG_HT_CHAIN_DISTRIBUTE is not set
@@ -303,14 +327,12 @@ CONFIG_DIMM_VOLTAGE_SET_SUPPORT=y
 CONFIG_LIMIT_HT_DOWN_WIDTH_16=y
 # CONFIG_LIMIT_HT_UP_WIDTH_8 is not set
 CONFIG_LIMIT_HT_UP_WIDTH_16=y
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x14
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -321,16 +343,23 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_AMD_SB700=y
 CONFIG_SOUTHBRIDGE_SPECIFIC_OPTIONS=y
+CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
 CONFIG_SOUTHBRIDGE_AMD_SUBTYPE_SP5100=y
 # CONFIG_SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT is not set
 CONFIG_SOUTHBRIDGE_AMD_SB700_DISABLE_ISA_DMA=y
 CONFIG_SOUTHBRIDGE_AMD_SR5650=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE=y
 CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 
@@ -338,7 +367,9 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 # Embedded Controllers
 #
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -355,6 +386,10 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -394,37 +429,40 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-CONFIG_VERSTAGE_ADDR=0x2000000
 # CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-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_LOAD=y
+CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 CONFIG_SMBUS_HAS_AUX_CHANNELS=y
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT=y
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_PCIEXP_ASPM=y
-CONFIG_PCIEXP_CLK_PM=y
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_SOFTWARE_I2C is not set
@@ -433,13 +471,14 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_ELOG is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
-CONFIG_SPI_ATOMIC_SEQUENCING=y
-CONFIG_SPI_FLASH_MEMORY_MAPPED=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
 # CONFIG_SPI_FLASH_NO_FAST_READ is not set
 CONFIG_SPI_FLASH_ADESTO=y
 CONFIG_SPI_FLASH_AMIC=y
@@ -452,63 +491,89 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
-CONFIG_DEVICE_SPECIFIC_OPTIONS=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 CONFIG_DRIVERS_I2C_W83795=y
-# CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 # CONFIG_INTEL_GMA_ACPI is not set
+# CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
+# CONFIG_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
+# CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -519,8 +584,11 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+CONFIG_CONSOLE_POST=y
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+CONFIG_ACPI_HUGE_LOWMEM_BACKUP=y
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK=y
@@ -535,7 +603,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_PCI_IO_CFG_EXT=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -549,13 +616,13 @@ CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -564,6 +631,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 
@@ -573,6 +641,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 # CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -590,13 +659,19 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 CONFIG_ENABLE_APIC_EXT_ID=y
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/kgpe-d16/revision b/projects/coreboot/configs/seabios/kgpe-d16/revision
deleted file mode 100644
index a4c248f2..00000000
--- a/projects/coreboot/configs/seabios/kgpe-d16/revision
+++ /dev/null
@@ -1 +0,0 @@
-eee0e229764e965996479d7eb07e6086176b8bf0
diff --git a/projects/coreboot/configs/seabios/macbook21/config b/projects/coreboot/configs/seabios/macbook21/config
index cdf23a4d..2fcf83ea 100644
--- a/projects/coreboot/configs/seabios/macbook21/config
+++ b/projects/coreboot/configs/seabios/macbook21/config
@@ -6,47 +6,38 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION="    MB21.88Z.00A5.B07.0706270922"
+CONFIG_COREBOOT_BUILD=y
+CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -60,16 +51,18 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,38 +103,45 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="apple/macbook21"
 CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
 CONFIG_MAINBOARD_VENDOR="Apple"
 CONFIG_MAX_CPUS=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x200000
 CONFIG_VGA_BIOS_ID="8086,27a2"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX"
-CONFIG_DCACHE_RAM_BASE=0xffdf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
-# CONFIG_BOARD_APPLE_MACBOOK11 is not set
 CONFIG_BOARD_APPLE_MACBOOK21=y
+# CONFIG_BOARD_APPLE_MACBOOK11 is not set
+# CONFIG_BOARD_APPLE_IMAC52 is not set
 # CONFIG_BOARD_APPLE_MACBOOKAIR4_2 is not set
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
+CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
@@ -151,11 +153,14 @@ CONFIG_BOARD_ROMSIZE_KB_2048=y
 CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -166,20 +171,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0x4000
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -200,25 +222,30 @@ CONFIG_CPU_INTEL_SOCKET_MFCPGA478=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -233,28 +260,20 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
 CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
+CONFIG_I945_LVDS=y
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
 # CONFIG_CHECK_SLFRCS_ON_RESUME is not set
-# CONFIG_VRAM_SIZE_1MB is not set
-# CONFIG_VRAM_SIZE_4MB is not set
-# CONFIG_VRAM_SIZE_8MB is not set
-# CONFIG_VRAM_SIZE_16MB is not set
-# CONFIG_VRAM_SIZE_32MB is not set
-# CONFIG_VRAM_SIZE_48MB is not set
-CONFIG_VRAM_SIZE_64MB=y
-CONFIG_VRAM_SIZE=0x70
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -264,19 +283,28 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -292,6 +320,10 @@ CONFIG_EC_ACPI=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -330,110 +362,160 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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
+# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
+# CONFIG_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+CONFIG_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
+# CONFIG_SPI_FLASH_SMM is not set
+# CONFIG_SPI_FLASH_NO_FAST_READ is not set
+CONFIG_SPI_FLASH_ADESTO=y
+CONFIG_SPI_FLASH_AMIC=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -450,7 +532,9 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
@@ -465,7 +549,6 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -478,13 +561,13 @@ CONFIG_COMMON_FADT=y
 CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -493,10 +576,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -506,19 +596,28 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/macbook21/revision b/projects/coreboot/configs/seabios/macbook21/revision
deleted file mode 100644
index 1ab8299e..00000000
--- a/projects/coreboot/configs/seabios/macbook21/revision
+++ /dev/null
@@ -1 +0,0 @@
-2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
index 4ce855b1..a6110151 100644
--- a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
+++ b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
@@ -6,47 +6,38 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
+# CONFIG_UBSAN is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,6 +103,7 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="emulation/qemu-i440fx"
@@ -115,16 +111,18 @@ CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 i440fx/piix4"
 CONFIG_IRQ_SLOT_COUNT=6
 CONFIG_MAINBOARD_VENDOR="Emulation"
 CONFIG_MAX_CPUS=1
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x800000
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_UDELAY_IO=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
@@ -133,15 +131,15 @@ CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
 # CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 # CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_DEVICE=y
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 i440fx/piix4"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -152,11 +150,14 @@ CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -167,18 +168,33 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82371eb/bootblock.c"
-CONFIG_HEAP_SIZE=0x4000
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -198,22 +214,24 @@ CONFIG_NUM_IPI_STARTS=2
 CONFIG_CPU_QEMU_X86=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+CONFIG_UDELAY_IO=y
 # CONFIG_UDELAY_LAPIC is not set
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 # CONFIG_SUPPORT_CPU_UCODE_IN_CBFS is not set
@@ -226,11 +244,11 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+CONFIG_NO_MMCONF_SUPPORT=y
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_MAX_PIRQ_LINKS=4
 
@@ -240,19 +258,28 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -268,6 +295,10 @@ CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -306,111 +337,142 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
-# CONFIG_HAVE_CMOS_DEFAULT is not set
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+# CONFIG_MMCONF_SUPPORT is not set
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
-# CONFIG_PXE_ROM is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
-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_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+# CONFIG_SPI_FLASH is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+# CONFIG_HAVE_USBDEBUG is not set
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+# CONFIG_DRIVERS_AMD_PI is not set
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 # CONFIG_INTEL_GMA_ACPI is not set
+# CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-# CONFIG_HAVE_USBDEBUG is not set
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-# CONFIG_MMCONF_SUPPORT_DEFAULT is not set
-# CONFIG_MMCONF_SUPPORT is not set
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -429,7 +491,9 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 # CONFIG_HAVE_ACPI_RESUME is not set
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 # CONFIG_HAVE_HARD_RESET is not set
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
@@ -441,7 +505,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 # CONFIG_IOAPIC is not set
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_PIRQ_TABLE=y
@@ -454,13 +517,13 @@ CONFIG_HAVE_PIRQ_TABLE=y
 # CONFIG_GENERATE_MP_TABLE is not set
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 i440fx/piix4"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -469,10 +532,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -482,17 +552,24 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
 # CONFIG_DEBUG_PIRQ is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/revision b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/revision
deleted file mode 100644
index 1ab8299e..00000000
--- a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/revision
+++ /dev/null
@@ -1 +0,0 @@
-2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/projects/coreboot/configs/seabios/qemu_q35_ich9/config b/projects/coreboot/configs/seabios/qemu_q35_ich9/config
index eaa60108..7c3a47cf 100644
--- a/projects/coreboot/configs/seabios/qemu_q35_ich9/config
+++ b/projects/coreboot/configs/seabios/qemu_q35_ich9/config
@@ -6,45 +6,36 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
+# CONFIG_UBSAN is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -58,16 +49,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -84,6 +77,7 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_LENOVO is not set
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -95,6 +89,7 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -106,24 +101,27 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="emulation/qemu-q35"
 CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 q35/ich9"
 CONFIG_MAINBOARD_VENDOR="Emulation"
 CONFIG_MAX_CPUS=1
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x800000
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_UDELAY_IO=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
-CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
+CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 # CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
@@ -132,18 +130,20 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
 # CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 # CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_DEVICE=y
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
-CONFIG_BOARD_ROMSIZE_KB_256=y
+CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -152,11 +152,14 @@ CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -167,19 +170,35 @@ CONFIG_FMDFILE=""
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0x4000
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -199,22 +218,24 @@ CONFIG_NUM_IPI_STARTS=2
 CONFIG_CPU_QEMU_X86=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+CONFIG_UDELAY_IO=y
 # CONFIG_UDELAY_LAPIC is not set
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 # CONFIG_SUPPORT_CPU_UCODE_IN_CBFS is not set
@@ -227,13 +248,12 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -243,18 +263,27 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -270,6 +299,10 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -308,111 +341,139 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
-# CONFIG_HAVE_CMOS_DEFAULT is not set
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
-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_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+# CONFIG_SPI_FLASH is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 # CONFIG_INTEL_GMA_ACPI is not set
+# CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -431,7 +492,9 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 # CONFIG_HAVE_ACPI_RESUME is not set
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
@@ -443,7 +506,6 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_COMMON_FADT is not set
@@ -455,13 +517,13 @@ CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -470,10 +532,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -482,19 +551,26 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_DEBUG_CBFS is not set
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/qemu_q35_ich9/revision b/projects/coreboot/configs/seabios/qemu_q35_ich9/revision
deleted file mode 100644
index 1ab8299e..00000000
--- a/projects/coreboot/configs/seabios/qemu_q35_ich9/revision
+++ /dev/null
@@ -1 +0,0 @@
-2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/projects/coreboot/configs/seabios/r400_16mb/config b/projects/coreboot/configs/seabios/r400_16mb/config
index d0be0b1a..be8209a7 100644
--- a/projects/coreboot/configs/seabios/r400_16mb/config
+++ b/projects/coreboot/configs/seabios/r400_16mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0xFFD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 CONFIG_BOARD_LENOVO_R400=y
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/r400_16mb/revision b/projects/coreboot/configs/seabios/r400_16mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/r400_16mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/r400_4mb/config b/projects/coreboot/configs/seabios/r400_4mb/config
index 13ea1c67..d838e8a7 100644
--- a/projects/coreboot/configs/seabios/r400_4mb/config
+++ b/projects/coreboot/configs/seabios/r400_4mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 CONFIG_BOARD_LENOVO_R400=y
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/r400_4mb/revision b/projects/coreboot/configs/seabios/r400_4mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/r400_4mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/r400_8mb/config b/projects/coreboot/configs/seabios/r400_8mb/config
index 56a22708..197e906c 100644
--- a/projects/coreboot/configs/seabios/r400_8mb/config
+++ b/projects/coreboot/configs/seabios/r400_8mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 CONFIG_BOARD_LENOVO_R400=y
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/r400_8mb/revision b/projects/coreboot/configs/seabios/r400_8mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/r400_8mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/t400_16mb/config b/projects/coreboot/configs/seabios/t400_16mb/config
index 69af9ed1..cdda414b 100644
--- a/projects/coreboot/configs/seabios/t400_16mb/config
+++ b/projects/coreboot/configs/seabios/t400_16mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0xFFD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 CONFIG_BOARD_LENOVO_T400=y
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/t400_16mb/revision b/projects/coreboot/configs/seabios/t400_16mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/t400_16mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/t400_4mb/config b/projects/coreboot/configs/seabios/t400_4mb/config
index 74287e71..62c1f941 100644
--- a/projects/coreboot/configs/seabios/t400_4mb/config
+++ b/projects/coreboot/configs/seabios/t400_4mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 CONFIG_BOARD_LENOVO_T400=y
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/t400_4mb/revision b/projects/coreboot/configs/seabios/t400_4mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/t400_4mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/t400_8mb/config b/projects/coreboot/configs/seabios/t400_8mb/config
index 76be1d08..045c9d37 100644
--- a/projects/coreboot/configs/seabios/t400_8mb/config
+++ b/projects/coreboot/configs/seabios/t400_8mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 CONFIG_BOARD_LENOVO_T400=y
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/t400_8mb/revision b/projects/coreboot/configs/seabios/t400_8mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/t400_8mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/t500_16mb/config b/projects/coreboot/configs/seabios/t500_16mb/config
index db78f75a..99dab812 100644
--- a/projects/coreboot/configs/seabios/t500_16mb/config
+++ b/projects/coreboot/configs/seabios/t500_16mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0xFFD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/t500_16mb/revision b/projects/coreboot/configs/seabios/t500_16mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/t500_16mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/t500_4mb/config b/projects/coreboot/configs/seabios/t500_4mb/config
index 2d9c18c5..99908d32 100644
--- a/projects/coreboot/configs/seabios/t500_4mb/config
+++ b/projects/coreboot/configs/seabios/t500_4mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/t500_4mb/revision b/projects/coreboot/configs/seabios/t500_4mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/t500_4mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/t500_8mb/config b/projects/coreboot/configs/seabios/t500_8mb/config
index d693bc98..94541069 100644
--- a/projects/coreboot/configs/seabios/t500_8mb/config
+++ b/projects/coreboot/configs/seabios/t500_8mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/t500_8mb/revision b/projects/coreboot/configs/seabios/t500_8mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/t500_8mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/t60/config b/projects/coreboot/configs/seabios/t60/config
index 67d83d1f..04512207 100644
--- a/projects/coreboot/configs/seabios/t60/config
+++ b/projects/coreboot/configs/seabios/t60/config
@@ -6,47 +6,38 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION="79ETE7WW (2.27 )"
+CONFIG_COREBOOT_BUILD=y
+CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,59 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t60"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T60"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x200000
 CONFIG_VGA_BIOS_ID="8086,27a2"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
-CONFIG_DCACHE_RAM_BASE=0xffdf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
+# CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 CONFIG_BOARD_LENOVO_T60=y
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
-CONFIG_SEABIOS_PS2_TIMEOUT=3000
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
@@ -161,11 +167,14 @@ CONFIG_BOARD_ROMSIZE_KB_2048=y
 CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -176,20 +185,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0x4000
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -210,25 +236,30 @@ CONFIG_CPU_INTEL_SOCKET_MFCPGA478=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -243,28 +274,20 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
 CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
+CONFIG_I945_LVDS=y
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
 # CONFIG_CHECK_SLFRCS_ON_RESUME is not set
-# CONFIG_VRAM_SIZE_1MB is not set
-# CONFIG_VRAM_SIZE_4MB is not set
-# CONFIG_VRAM_SIZE_8MB is not set
-# CONFIG_VRAM_SIZE_16MB is not set
-# CONFIG_VRAM_SIZE_32MB is not set
-# CONFIG_VRAM_SIZE_48MB is not set
-CONFIG_VRAM_SIZE_64MB=y
-CONFIG_VRAM_SIZE=0x70
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -274,7 +297,12 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
 
@@ -283,16 +311,23 @@ CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
 #
 CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -308,6 +343,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -346,111 +385,161 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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
+# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
+# CONFIG_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+CONFIG_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
+# CONFIG_SPI_FLASH_SMM is not set
+# CONFIG_SPI_FLASH_NO_FAST_READ is not set
+CONFIG_SPI_FLASH_ADESTO=y
+CONFIG_SPI_FLASH_AMIC=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+CONFIG_DRIVERS_I2C_CK505=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -467,7 +556,9 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
@@ -482,7 +573,6 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -501,6 +591,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -509,10 +600,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -522,19 +620,28 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/t60/revision b/projects/coreboot/configs/seabios/t60/revision
deleted file mode 100644
index 1ab8299e..00000000
--- a/projects/coreboot/configs/seabios/t60/revision
+++ /dev/null
@@ -1 +0,0 @@
-2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/projects/coreboot/configs/seabios/w500_16mb/config b/projects/coreboot/configs/seabios/w500_16mb/config
index bbc29cba..99dab812 100644
--- a/projects/coreboot/configs/seabios/w500_16mb/config
+++ b/projects/coreboot/configs/seabios/w500_16mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
-CONFIG_MAINBOARD_PART_NUMBER="ThinkPad W500"
+CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0xFFD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/w500_16mb/revision b/projects/coreboot/configs/seabios/w500_16mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/w500_16mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/w500_4mb/config b/projects/coreboot/configs/seabios/w500_4mb/config
index d49c420d..99908d32 100644
--- a/projects/coreboot/configs/seabios/w500_4mb/config
+++ b/projects/coreboot/configs/seabios/w500_4mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
-CONFIG_MAINBOARD_PART_NUMBER="ThinkPad W500"
+CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/w500_4mb/revision b/projects/coreboot/configs/seabios/w500_4mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/w500_4mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/w500_8mb/config b/projects/coreboot/configs/seabios/w500_8mb/config
index a03171ac..94541069 100644
--- a/projects/coreboot/configs/seabios/w500_8mb/config
+++ b/projects/coreboot/configs/seabios/w500_8mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/t400"
-CONFIG_MAINBOARD_PART_NUMBER="ThinkPad W500"
+CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
-CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_MAX_CPUS=4
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 CONFIG_BOARD_LENOVO_T500=y
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -214,19 +231,22 @@ CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
+CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_CPU_INTEL_MODEL_1067X=y
-CONFIG_CPU_INTEL_SOCKET_BGA956=y
+CONFIG_CPU_INTEL_SOCKET_MPGA478MN=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +258,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +275,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -271,22 +292,43 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+CONFIG_SUPERIO_NSC_PC87384=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
+CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +345,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -339,10 +385,12 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
-# CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,49 +401,56 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
@@ -406,55 +461,71 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -465,25 +536,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -502,6 +577,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -530,16 +606,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -548,3 +625,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/w500_8mb/revision b/projects/coreboot/configs/seabios/w500_8mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/w500_8mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/x200_16mb/config b/projects/coreboot/configs/seabios/x200_16mb/config
index 02cc1c72..abf25d09 100644
--- a/projects/coreboot/configs/seabios/x200_16mb/config
+++ b/projects/coreboot/configs/seabios/x200_16mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x200"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0xFFD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_16m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -219,14 +236,16 @@ CONFIG_CPU_INTEL_SOCKET_BGA956=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +257,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +274,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -272,21 +292,40 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +342,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -342,7 +385,9 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,38 +398,43 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
@@ -394,8 +444,8 @@ CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
 CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
-# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
@@ -410,37 +460,60 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -450,6 +523,7 @@ CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -460,25 +534,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -497,6 +575,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -525,16 +604,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -543,3 +623,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/x200_16mb/revision b/projects/coreboot/configs/seabios/x200_16mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/x200_16mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/x200_4mb/config b/projects/coreboot/configs/seabios/x200_4mb/config
index 22573e85..33b2d886 100644
--- a/projects/coreboot/configs/seabios/x200_4mb/config
+++ b/projects/coreboot/configs/seabios/x200_4mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x200"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_4m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -219,14 +236,16 @@ CONFIG_CPU_INTEL_SOCKET_BGA956=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +257,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +274,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -272,21 +292,40 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +342,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -342,7 +385,9 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,38 +398,43 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
@@ -394,8 +444,8 @@ CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
 CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
-# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
@@ -410,37 +460,60 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -450,6 +523,7 @@ CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -460,25 +534,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -497,6 +575,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -525,16 +604,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -543,3 +623,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/x200_4mb/revision b/projects/coreboot/configs/seabios/x200_4mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/x200_4mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/x200_8mb/config b/projects/coreboot/configs/seabios/x200_8mb/config
index 2ef9b6e0..8e2be019 100644
--- a/projects/coreboot/configs/seabios/x200_8mb/config
+++ b/projects/coreboot/configs/seabios/x200_8mb/config
@@ -6,43 +6,34 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_NO_XIP_EARLY_STAGES is not set
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,48 +103,63 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x200"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_VGA_BIOS_ID="8086,2a42"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-CONFIG_DCACHE_RAM_BASE=0xffaf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
+CONFIG_HAVE_IFD_BIN=y
+# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-# CONFIG_CONSOLE_POST is not set
+# CONFIG_VBOOT is not set
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_X60 is not set
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -160,13 +170,13 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -178,24 +188,31 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -219,14 +236,16 @@ CONFIG_CPU_INTEL_SOCKET_BGA956=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_UDELAY_LAPIC=y
+CONFIG_LAPIC_MONOTONIC_TIMER=y
+# CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -238,7 +257,9 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -253,11 +274,10 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_GM45=y
@@ -272,21 +292,40 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
+# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
 #
 CONFIG_SUPERIO_NSC_PC87382=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_HAVE_INTEL_FIRMWARE=y
+
+#
+# Intel Firmware
+#
+# CONFIG_EM100 is not set
+# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -303,6 +342,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -342,7 +385,9 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -353,38 +398,43 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_POSTCAR_STAGE is not set
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
@@ -394,8 +444,8 @@ CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
 CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
-# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
-# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
@@ -410,37 +460,60 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -450,6 +523,7 @@ CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -460,25 +534,29 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_GENERIC_UDELAY is not set
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -497,6 +575,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -525,16 +604,17 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
@@ -543,3 +623,8 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_REG_SCRIPT is not set
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/x200_8mb/revision b/projects/coreboot/configs/seabios/x200_8mb/revision
deleted file mode 100644
index d4e47be8..00000000
--- a/projects/coreboot/configs/seabios/x200_8mb/revision
+++ /dev/null
@@ -1 +0,0 @@
-d83b0e9ac4174cca92ac2c3b83a7e8491a9a1ff4
diff --git a/projects/coreboot/configs/seabios/x60/config b/projects/coreboot/configs/seabios/x60/config
index f73cd211..8257be82 100644
--- a/projects/coreboot/configs/seabios/x60/config
+++ b/projects/coreboot/configs/seabios/x60/config
@@ -6,47 +6,38 @@
 #
 # General setup
 #
+CONFIG_COREBOOT_BUILD=y
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
-# CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_UTIL_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
-# CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
-CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
-# CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_CUSTOM=y
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
+# CONFIG_UBSAN is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_GENERIC_GPIO_LIB is not set
-# CONFIG_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
-# CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
 #
+
+#
+# Important: Run 'make distclean' before switching boards
+#
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -60,16 +51,18 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BCOM is not set
-# CONFIG_VENDOR_BIFFEROS is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
+# CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
+# CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
@@ -86,6 +79,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
+# CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
@@ -97,6 +91,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
+# CONFIG_VENDOR_SAPPHIRE is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SOYO is not set
 # CONFIG_VENDOR_SUNW is not set
@@ -108,6 +103,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
 # CONFIG_VENDOR_WINENT is not set
+# CONFIG_VENDOR_WINNET is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x60"
@@ -115,42 +111,52 @@ CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X60"
 CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
+CONFIG_CBFS_SIZE=0x200000
 CONFIG_VGA_BIOS_ID="8086,27a2"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
-CONFIG_DCACHE_RAM_BASE=0xffdf8000
+CONFIG_DCACHE_RAM_BASE=0xfefc0000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_IO=y
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
+# CONFIG_VBOOT is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
+# CONFIG_BOARD_LENOVO_L520 is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
+# CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+# CONFIG_BOARD_LENOVO_X131E is not set
+# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X220I is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 CONFIG_BOARD_LENOVO_X60=y
-CONFIG_SEABIOS_PS2_TIMEOUT=3000
+# CONFIG_BOARD_LENOVO_Z61T is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
@@ -162,11 +168,14 @@ CONFIG_BOARD_ROMSIZE_KB_2048=y
 CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
-CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -177,20 +186,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xfef00000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# CONFIG_SOC_INTEL_GLK is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
+# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_HEAP_SIZE=0x4000
-# CONFIG_SOC_MARVELL_ARMADA38X is not set
-# CONFIG_SOC_MARVELL_BG4CD is not set
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_SOC_INTEL_KABYLAKE is not set
+# CONFIG_SOC_LOWRISC_LOWRISC is not set
+# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -211,25 +237,30 @@ CONFIG_CPU_INTEL_SOCKET_MFCPGA478=y
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_VMX_LOCK_BIT=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
+# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -244,28 +275,20 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
+# CONFIG_NO_MMCONF_SUPPORT is not set
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
-CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
 CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
+CONFIG_I945_LVDS=y
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
 # CONFIG_CHECK_SLFRCS_ON_RESUME is not set
-# CONFIG_VRAM_SIZE_1MB is not set
-# CONFIG_VRAM_SIZE_4MB is not set
-# CONFIG_VRAM_SIZE_8MB is not set
-# CONFIG_VRAM_SIZE_16MB is not set
-# CONFIG_VRAM_SIZE_32MB is not set
-# CONFIG_VRAM_SIZE_48MB is not set
-CONFIG_VRAM_SIZE_64MB=y
-CONFIG_VRAM_SIZE=0x70
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -275,7 +298,12 @@ 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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
+# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
 
@@ -284,16 +312,23 @@ CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
 #
 CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_SUPERIO_NSC_PC87392=y
+# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
+CONFIG_H8_BEEP_ON_DEATH=y
+CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
+# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -309,6 +344,10 @@ CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -347,114 +386,164 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
+# CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
+# CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 
 #
 # Devices
 #
+CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-CONFIG_NATIVE_VGA_INIT_USE_EDID=y
-CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-CONFIG_ON_DEVICE_ROM_LOAD=y
+# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+# CONFIG_VGA_ROM_RUN is not set
+# CONFIG_NO_GFX_INIT is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
+
+#
+# Display
+#
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
-# CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
+CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # 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
+# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOFTWARE_I2C is not set
 
 #
-# Display
-#
-# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
-
-#
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
+# CONFIG_IPMI_KCS is not set
+CONFIG_DRIVERS_LENOVO_WACOM=y
+# CONFIG_DIGITIZER_AUTODETECT is not set
+CONFIG_DIGITIZER_PRESENT=y
+# CONFIG_DIGITIZER_ABSENT is not set
+# CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SET_LED_MODE is not set
+CONFIG_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
+# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
+# CONFIG_SPI_FLASH_SMM is not set
+# CONFIG_SPI_FLASH_NO_FAST_READ is not set
+CONFIG_SPI_FLASH_ADESTO=y
+CONFIG_SPI_FLASH_AMIC=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
+# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+# CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+CONFIG_DRIVERS_I2C_CK505=y
+# CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-CONFIG_DRIVERS_ICS_954309=y
-# CONFIG_INTEL_DP is not set
+# CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-CONFIG_DRIVERS_LENOVO_WACOM=y
-# CONFIG_DIGITIZER_AUTODETECT is not set
-CONFIG_DIGITIZER_PRESENT=y
-# CONFIG_DIGITIZER_ABSENT is not set
+# CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
+# CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_COMMONLIB_STORAGE is not set
+
+#
+# Security
+#
+
+#
+# Verified Boot (vboot)
+#
+# CONFIG_ACPI_SATA_GENERATOR is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
-CONFIG_STACK_SIZE=0x1000
-CONFIG_MMCONF_SUPPORT_DEFAULT=y
-CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
+# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
+# CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -471,7 +560,9 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
+CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
@@ -486,7 +577,6 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
@@ -506,6 +596,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -514,10 +605,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(obj)/../seabios-bios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -528,19 +626,28 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_RAM_SETUP is not set
 # CONFIG_HAVE_DEBUG_CAR is not set
 # CONFIG_DEBUG_PIRQ is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
+# CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
-CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
+CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/seabios/x60/revision b/projects/coreboot/configs/seabios/x60/revision
deleted file mode 100644
index 1ab8299e..00000000
--- a/projects/coreboot/configs/seabios/x60/revision
+++ /dev/null
@@ -1 +0,0 @@
-2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch b/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch
index da906849..24964bb4 100644
--- a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch
+++ b/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch
@@ -1,13 +1,10 @@
-From 6c534728fde6a9582915995a2742808764fe4783 Mon Sep 17 00:00:00 2001
+From b403ddd709578d11f1e6d32abfc94701f57cae16 Mon Sep 17 00:00:00 2001
 From: Paul Kocialkowski <contact@paulk.fr>
-Date: Wed, 20 Jul 2016 16:03:30 +0200
-Subject: [PATCH 1/2] Avoid using git submodules for 3rdparty
+Date: Thu, 25 Jan 2018 17:31:55 -0500
+Subject: [PATCH] Avoid using git submodules for 3rdparty
 
 This gets rid of git submodules entirely, to avoid the nuisance caused
 by automatically checking them out.
-
-Change-Id: I54de09656bd2dd9c308bd6c8dce554945aa8e535
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
 ---
  .gitmodules                   | 20 --------------------
  3rdparty/arm-trusted-firmware |  1 -
@@ -16,8 +13,8 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
  3rdparty/libgfxinit           |  1 -
  3rdparty/libhwbase            |  1 -
  3rdparty/vboot                |  1 -
- Makefile.inc                  | 11 -----------
- 8 files changed, 37 deletions(-)
+ Makefile.inc                  | 12 ------------
+ 8 files changed, 38 deletions(-)
  delete mode 160000 3rdparty/arm-trusted-firmware
  delete mode 160000 3rdparty/blobs
  delete mode 160000 3rdparty/chromeec
@@ -26,7 +23,7 @@ Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
  delete mode 160000 3rdparty/vboot
 
 diff --git a/.gitmodules b/.gitmodules
-index c3270e6ae2..3a617c7dc5 100644
+index c3270e6..3a617c7 100644
 --- a/.gitmodules
 +++ b/.gitmodules
 @@ -1,23 +1,3 @@
@@ -55,51 +52,51 @@ index c3270e6ae2..3a617c7dc5 100644
 -	url = ../libgfxinit.git
 diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware
 deleted file mode 160000
-index 236c27d21f..0000000000
+index b118723..0000000
 --- a/3rdparty/arm-trusted-firmware
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit 236c27d21f52ad8f0a998e54774e3d8a4b59129d
+-Subproject commit b1187232fdf819586ba8c8ece4a27a7515cbdc6d
 diff --git a/3rdparty/blobs b/3rdparty/blobs
 deleted file mode 160000
-index 8090bdd598..0000000000
+index 8eb92ba..0000000
 --- a/3rdparty/blobs
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit 8090bdd59853599e469b7503ea473ca12e8c681b
+-Subproject commit 8eb92ba947e171df11b3c62f5f257ce69b9e2d55
 diff --git a/3rdparty/chromeec b/3rdparty/chromeec
 deleted file mode 160000
-index bcffec7fdc..0000000000
+index 9fb1038..0000000
 --- a/3rdparty/chromeec
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit bcffec7fdc50e959cb298d094d8af472777dba75
+-Subproject commit 9fb10386a720d270e37ce61da3ff3a6d5a69951e
 diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit
 deleted file mode 160000
-index 88a7f17b7d..0000000000
+index 42fb2d0..0000000
 --- a/3rdparty/libgfxinit
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit 88a7f17b7d7a4f8a4d25ef6b87c71236b0862f5d
+-Subproject commit 42fb2d065d604eb08c723ac6b96aeebb4c84cbd3
 diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase
 deleted file mode 160000
-index aab715f166..0000000000
+index 6685971..0000000
 --- a/3rdparty/libhwbase
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit aab715f166bf1b54cfbd6982e8df49248ea544d8
+-Subproject commit 66859712e4817288591908d737dbf41ddea31c3a
 diff --git a/3rdparty/vboot b/3rdparty/vboot
 deleted file mode 160000
-index adfafba793..0000000000
+index f6780a3..0000000
 --- a/3rdparty/vboot
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit adfafba793684ed92965dfbd86b3fb3463975d8c
+-Subproject commit f6780a36ff19b36abcdb5ace903c4ae2272fb574
 diff --git a/Makefile.inc b/Makefile.inc
-index c5ce30f2b1..919a5d4ac1 100644
+index 413f7ad..ed2d839 100644
 --- a/Makefile.inc
 +++ b/Makefile.inc
-@@ -183,17 +183,6 @@ ifeq ($(CONFIG_COVERAGE),y)
+@@ -191,18 +191,6 @@ ifeq ($(CONFIG_COVERAGE),y)
  ramstage-c-ccopts += -fprofile-arcs -ftest-coverage
  endif
  
@@ -111,12 +108,13 @@ index c5ce30f2b1..919a5d4ac1 100644
 -# unless explicitly requested and enabled through --checkout
 -forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs))
 -endif
--export UPDATED_SUBMODULES:=1
+-UPDATED_SUBMODULES:=1
+-COREBOOT_EXPORTS += UPDATED_SUBMODULES
 -endif
 -
+ postcar-c-deps:=$$(OPTION_TABLE_H)
  ramstage-c-deps:=$$(OPTION_TABLE_H)
  romstage-c-deps:=$$(OPTION_TABLE_H)
- libverstage-c-deps:=$$(OPTION_TABLE_H)
 -- 
-2.11.0
+1.9.1
 
diff --git a/projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch b/projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch
deleted file mode 100644
index aa76b57a..00000000
--- a/projects/coreboot/patches/0002-libpayload-Enable-USB-HID-in-veyron-configuration.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 417866c23c193a44a84d686ce1c2ee3d43284e05 Mon Sep 17 00:00:00 2001
-From: Paul Kocialkowski <contact@paulk.fr>
-Date: Mon, 19 Dec 2016 20:23:44 +0100
-Subject: [PATCH 2/2] libpayload: Enable USB HID in veyron configuration
-
-This enables USB HID support in the veyron config, since it seems to
-work correctly and is needed for interaction with depthcharge on devices
-without an embedded keyboard (such as veyron_mickey).
-
-Change-Id: Icae829e3a132005df17bcb6f7e6f8a190912576d
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
----
- payloads/libpayload/configs/config.veyron | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/payloads/libpayload/configs/config.veyron b/payloads/libpayload/configs/config.veyron
-index e80535c63e..b643e92a48 100644
---- a/payloads/libpayload/configs/config.veyron
-+++ b/payloads/libpayload/configs/config.veyron
-@@ -4,4 +4,3 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y
- CONFIG_LP_TIMER_RK3288=y
- CONFIG_LP_USB_EHCI=y
- CONFIG_LP_USB_DWC2=y
--# CONFIG_LP_USB_HID is not set
--- 
-2.11.0
-
diff --git a/projects/cros-ec/configs/nyan/revision b/projects/cros-ec/configs/nyan/revision
index 7a809c4c..6ce6b84b 100644
--- a/projects/cros-ec/configs/nyan/revision
+++ b/projects/cros-ec/configs/nyan/revision
@@ -1 +1 @@
-3c5457348e08d8606a8398cc9265cb144ec4baf6
+origin/release-R65-10323.B
diff --git a/projects/cros-ec/configs/veyron/revision b/projects/cros-ec/configs/veyron/revision
index e27b3d1c..6ce6b84b 100644
--- a/projects/cros-ec/configs/veyron/revision
+++ b/projects/cros-ec/configs/veyron/revision
@@ -1 +1 @@
-242f6bd3e6f3b2d0b0e2b764c34fbab2db051189
+origin/release-R65-10323.B
diff --git a/projects/depthcharge/configs/revision b/projects/depthcharge/configs/revision
index bc799613..6ce6b84b 100644
--- a/projects/depthcharge/configs/revision
+++ b/projects/depthcharge/configs/revision
@@ -1 +1 @@
-66b58a339a7fcc79248b9ef7853449542683c45d
+origin/release-R65-10323.B
diff --git a/projects/flashmap/configs/revision b/projects/flashmap/configs/revision
index 79d3a325..6ce6b84b 100644
--- a/projects/flashmap/configs/revision
+++ b/projects/flashmap/configs/revision
@@ -1 +1 @@
-origin/release-R56-9000.B
+origin/release-R65-10323.B
diff --git a/projects/flashrom-cros/configs/revision b/projects/flashrom-cros/configs/revision
index 79d3a325..6ce6b84b 100644
--- a/projects/flashrom-cros/configs/revision
+++ b/projects/flashrom-cros/configs/revision
@@ -1 +1 @@
-origin/release-R56-9000.B
+origin/release-R65-10323.B
diff --git a/projects/flashrom/configs/revision b/projects/flashrom/configs/revision
index 8031930e..0a38356a 100644
--- a/projects/flashrom/configs/revision
+++ b/projects/flashrom/configs/revision
@@ -1 +1 @@
-v0.9.9
+a72d5a98286272094dda06f5c69b48910f6a7451
diff --git a/projects/flashrom/flashrom b/projects/flashrom/flashrom
index bc3199f0..e01b66be 100755
--- a/projects/flashrom/flashrom
+++ b/projects/flashrom/flashrom
@@ -27,7 +27,7 @@ usage() {
 download() {
 	local repository=$project
 
-	project_download_git "$project" "$repository" "https://github.com/stefanct/flashrom.git" "$@"
+	project_download_git "$project" "$repository" 'https://review.coreboot.org/flashrom.git https://github.com/stefanct/flashrom.git' "$@"
 }
 
 download_check() {
diff --git a/projects/flashrom/patches/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch b/projects/flashrom/patches/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch
deleted file mode 100644
index f9d51806..00000000
--- a/projects/flashrom/patches/0001-New-laptops-whitelisted-ThinkPad-R400-and-ThinkPad-T.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 52a0b55c77635dc026793e66d516e3aed335706a Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Fri, 11 Mar 2016 06:35:03 +0000
-Subject: [PATCH 1/1] New laptops whitelisted: ThinkPad R400 and ThinkPad T500
-
-Support for these laptops was merged in coreboot a while ago, so it makes sense
-for flashrom to whitelist them.
----
- board_enable.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/board_enable.c b/board_enable.c
-index 7b152d1..1d56203 100644
---- a/board_enable.c
-+++ b/board_enable.c
-@@ -2427,7 +2427,9 @@ const struct board_match board_matches[] = {
- 	{0x8086, 0x7190,      0,      0,  0x8086, 0x7110,      0,      0, "^SE440BX-2$", NULL, NULL,          P3, "Intel",       "SE440BX-2",             0,   NT, intel_piix4_gpo27_lower},
- 	{0x1022, 0x7468,      0,      0,  0x1022, 0x7460,      0,      0, NULL,         "iwill", "dk8_htx",   P3, "IWILL",       "DK8-HTX",               0,   OK, w83627hf_gpio24_raise_2e},
- 	{0x8086, 0x27A0, 0x8086, 0x27a0,  0x8086, 0x27b8, 0x8086, 0x27b8, NULL,        "kontron", "986lcd-m", P3, "Kontron",     "986LCD-M",              0,   OK, board_kontron_986lcd_m},
-+    {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad R400", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad R400",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T400", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T400",         0,   OK, p2_whitelist_laptop},
-+    {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T500", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad T500",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x1E22, 0x17AA, 0x21F6,  0x8086, 0x1E55, 0x17AA, 0x21F6, "^ThinkPad T530", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T530",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2015,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60",          0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2017,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60(s)",       0,   OK, p2_whitelist_laptop},
--- 
-1.9.1
-
diff --git a/projects/flashrom/patches/0001-Purge-redundant-Macronix-chips.patch b/projects/flashrom/patches/0001-Purge-redundant-Macronix-chips.patch
new file mode 100644
index 00000000..e14bfe0c
--- /dev/null
+++ b/projects/flashrom/patches/0001-Purge-redundant-Macronix-chips.patch
@@ -0,0 +1,91 @@
+From 4a262ea16a10a6067d48d70a2195151dea9292c6 Mon Sep 17 00:00:00 2001
+From: Andrew Robbins <contact@andrewrobbins.info>
+Date: Fri, 2 Mar 2018 00:13:16 -0500
+Subject: [PATCH] Purge redundant Macronix chips
+
+Removing the redundant Macronix chips avoids the situation where X60
+owners have to specify their particular chip on the command line with
+flashrom's '--chip' flag.
+---
+ flashchips.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/flashchips.c b/flashchips.c
+index 1ab4986..7f85415 100644
+--- a/flashchips.c
++++ b/flashchips.c
+@@ -7595,7 +7595,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L1605A/MX25L1606E/MX25L1608E",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L1605,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 2048,
+ 		.page_size	= 256,
+ 		/* OTP: 64B total; enter 0xB1, exit 0xC1 (MX25L1606E and MX25L1608E only) */
+@@ -7634,7 +7634,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L1605D/MX25L1608D/MX25L1673E",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L1605,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 2048,
+ 		.page_size	= 256,
+ 		.feature_bits	= FEATURE_WRSR_WREN,
+@@ -7776,7 +7776,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L3205D/MX25L3208D",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L3205,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 4096,
+ 		.page_size	= 256,
+ 		/* OTP: 64B total; enter 0xB1, exit 0xC1 */
+@@ -7812,7 +7812,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L3206E/MX25L3208E",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L3205,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 4096,
+ 		.page_size	= 256,
+ 		/* OTP: 64B total; enter 0xB1, exit 0xC1 */
+@@ -7851,7 +7851,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L3273E",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L3205,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 4096,
+ 		.page_size	= 256,
+ 		/* OTP: 64B total; enter 0xB1, exit 0xC1 */
+@@ -7962,7 +7962,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L6405D",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L6405,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 8192,
+ 		.page_size	= 256,
+ 		/* OTP: 64B total; enter 0xB1, exit 0xC1 */
+@@ -7998,7 +7998,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L6406E/MX25L6408E",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L6405,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 8192,
+ 		.page_size	= 256,
+ 		/* MX25L6406E supports SFDP */
+@@ -8038,7 +8038,7 @@ const struct flashchip flashchips[] = {
+ 		.name		= "MX25L6436E/MX25L6445E/MX25L6465E/MX25L6473E/MX25L6473F",
+ 		.bustype	= BUS_SPI,
+ 		.manufacture_id	= MACRONIX_ID,
+-		.model_id	= MACRONIX_MX25L6405,
++		.model_id	= 0xDEAD,
+ 		.total_size	= 8192,
+ 		.page_size	= 256,
+ 		/* supports SFDP */
+-- 
+1.9.1
+
diff --git a/projects/flashrom/patches/0002-Add-whitelist-for-Taurinus-X200-laptop.patch b/projects/flashrom/patches/0002-Add-whitelist-for-Taurinus-X200-laptop.patch
deleted file mode 100644
index 0aa0701b..00000000
--- a/projects/flashrom/patches/0002-Add-whitelist-for-Taurinus-X200-laptop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b1828512abf58911cfb829cb6a98d4e8dbefadc2 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Fri, 11 Mar 2016 06:38:39 +0000
-Subject: [PATCH 1/1] Add whitelist for Taurinus X200 laptop
-
----
- board_enable.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/board_enable.c b/board_enable.c
-index 1d56203..a71061c 100644
---- a/board_enable.c
-+++ b/board_enable.c
-@@ -2437,6 +2437,7 @@ const struct board_match board_matches[] = {
- 	{0x8086, 0x3B07, 0x17AA, 0x2166,  0x8086, 0x3B30, 0x17AA, 0x2167, "^Lenovo X201", NULL, NULL,         P2, "IBM/Lenovo",  "ThinkPad X201",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x1E22, 0x17AA, 0x21FA,  0x8086, 0x1E55, 0x17AA, 0x21FA, "^ThinkPad X230", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad X230",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27A0, 0x17AA, 0x2017,  0x8086, 0x27B9, 0x17AA, 0x2009, "^ThinkPad X60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad X60(s)",       0,   OK, p2_whitelist_laptop},
-+	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^Taurinus X200", "Libiquity", "Taurinus X200", P2, "Libiquity", "ThinkPad X200", 0, OK, p2_whitelist_laptop},
- 	{0x8086, 0x2411, 0x8086, 0x2411,  0x8086, 0x7125, 0x0e11, 0xb165, NULL,         NULL, NULL,           P3, "Mitac",       "6513WU",                0,   OK, board_mitac_6513wu},
- 	{0x8086, 0x8186, 0x8086, 0x8186,  0x8086, 0x8800,      0,      0, "^MSC Vertriebs GmbH$", NULL, NULL, P2, "MSC",         "Q7-TCTC",               0,   OK, p2_not_a_laptop},
- 	{0x8086, 0x7190,      0,      0,  0x8086, 0x7110,      0,      0, "^MS-6163 (i440BX)$", NULL, NULL,   P3, "MSI",         "MS-6163 (MS-6163 Pro)", 0,   OK, intel_piix4_gpo14_raise},
--- 
-1.9.1
-
diff --git a/projects/flashrom/patches/0005-Workaround-MX25-reliable-operation.patch b/projects/flashrom/patches/0002-Workaround-for-MX25-chips.patch
index 472afd30..de6272c0 100644
--- a/projects/flashrom/patches/0005-Workaround-MX25-reliable-operation.patch
+++ b/projects/flashrom/patches/0002-Workaround-for-MX25-chips.patch
@@ -1,47 +1,59 @@
+From 886f1db7edbfc9ef4c9727b4f564c1e7e35d6565 Mon Sep 17 00:00:00 2001
+From: consts <grudnevkv@gmail.com>
+Date: Fri, 2 Mar 2018 07:03:37 +0000
+Subject: [PATCH] Workaround for MX25 chips
+
+https://notabug.org/libreboot/libreboot/issues/193
+---
+ cli_classic.c | 5 +++++
+ programmer.h  | 1 +
+ spi.c         | 9 +++++++++
+ 3 files changed, 15 insertions(+)
+
 diff --git a/cli_classic.c b/cli_classic.c
-index 0a09cfd..9eeafe1 100644
+index 31f7394..c60168c 100644
 --- a/cli_classic.c
 +++ b/cli_classic.c
-@@ -61,6 +61,7 @@ static void cli_classic_usage(const char *name)
- 	       " -i | --image <name>                only flash image <name> from flash layout\n"
+@@ -62,6 +62,7 @@ static void cli_classic_usage(const char *name)
  	       " -o | --output <logfile>            log output to <logfile>\n"
+ 	       "      --flash-contents <ref-file>   assume flash contents to be <ref-file>\n"
  	       " -L | --list-supported              print supported devices\n"
-+	       "    | --workaround-mx               keep flash busy before sending command\n"
++	       " -m | --workaround-mx               keep flash busy before sending command\n"
  #if CONFIG_PRINT_WIKI == 1
  	       " -z | --list-supported-wiki         print supported devices in wiki syntax\n"
  #endif
-@@ -130,6 +131,7 @@ int main(int argc, char *argv[])
+@@ -136,6 +137,7 @@ int main(int argc, char *argv[])
  		{"help",		0, NULL, 'h'},
  		{"version",		0, NULL, 'R'},
  		{"output",		1, NULL, 'o'},
-+		{"workaround-mx", 	0, NULL, 0x0101},
++		{"workaround-mx", 	0, NULL, 'm'},
  		{NULL,			0, NULL, 0},
  	};
  
-@@ -337,6 +339,9 @@ int main(int argc, char *argv[])
+@@ -347,6 +349,9 @@ int main(int argc, char *argv[])
  			}
  #endif /* STANDALONE */
  			break;
-+		case 0x0101: /* --workaround-mx */
-+		    	workaround_mx = 1;
-+		    	break;
++		case 'm': /* --workaround-mx */
++			workaround_mx = 1;
++			break;
  		default:
  			cli_classic_abort_usage();
  			break;
 diff --git a/programmer.h b/programmer.h
-index 1a6216a..6f97cfc 100644
+index 139f4fa..f54e690 100644
 --- a/programmer.h
 +++ b/programmer.h
-@@ -650,6 +650,7 @@ enum ich_chipset {
- 	CHIPSET_8_SERIES_WELLSBURG,
- 	CHIPSET_9_SERIES_WILDCAT_POINT,
+@@ -664,6 +664,7 @@ enum ich_chipset {
+ 	CHIPSET_100_SERIES_SUNRISE_POINT, /* also 6th/7th gen Core i/o (LP) variants */
+ 	CHIPSET_C620_SERIES_LEWISBURG,
  };
 +extern int workaround_mx; /* workaround for MX25* chips, makes flash operations more reliable, less failures */
  
  /* ichspi.c */
  #if CONFIG_INTERNAL == 1
 diff --git a/spi.c b/spi.c
-index 894f73f..05aa5d0 100644
+index 56f1fdf..4e61d88 100644
 --- a/spi.c
 +++ b/spi.c
 @@ -30,10 +30,19 @@
@@ -64,3 +76,6 @@ index 894f73f..05aa5d0 100644
  	return flash->mst->spi.command(flash, writecnt, readcnt, writearr,
  				       readarr);
  }
+-- 
+1.9.1
+
diff --git a/projects/flashrom/patches/0003-purged-chips.patch b/projects/flashrom/patches/0003-purged-chips.patch
deleted file mode 100644
index 0dc7e2bc..00000000
--- a/projects/flashrom/patches/0003-purged-chips.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From 260f0e096b385c9f53e9a28e79293131a11122a6 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Fri, 11 Mar 2016 06:50:50 +0000
-Subject: [PATCH 1/1] purged chips
-
----
- flashchips.c | 303 -----------------------------------------------------------
- 1 file changed, 303 deletions(-)
-
-diff --git a/flashchips.c b/flashchips.c
-index 0fc1b7a..5c94304 100644
---- a/flashchips.c
-+++ b/flashchips.c
-@@ -7451,80 +7451,6 @@ const struct flashchip flashchips[] = {
- 
- 	{
- 		.vendor		= "Macronix",
--		.name		= "MX25L1605",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L1605,
--		.total_size	= 2048,
--		.page_size	= 256,
--		.feature_bits	= FEATURE_WRSR_WREN,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */
--		.unlock		= spi_disable_blockprotect,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
--		.name		= "MX25L1605A/MX25L1606E/MX25L1608E",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L1605,
--		.total_size	= 2048,
--		.page_size	= 256,
--		/* OTP: 64B total; enter 0xB1, exit 0xC1 (MX25L1606E and MX25L1608E only) */
--		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {4 * 1024, 512} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_52,
--			}, {
--				.eraseblocks = { {64 * 1024, 32} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {2 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_bp3_srwd, /* MX25L1605A bp2 only */
--		.unlock		= spi_disable_blockprotect_bp3_srwd,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) supported (MX25L1608E supports dual-I/O read) */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
- 		.name		= "MX25L1605D/MX25L1608D/MX25L1673E",
- 		.bustype	= BUS_SPI,
- 		.manufacture_id	= MACRONIX_ID,
-@@ -7632,41 +7558,6 @@ const struct flashchip flashchips[] = {
- 
- 	{
- 		.vendor		= "Macronix",
--		.name		= "MX25L3205(A)",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L3205,
--		.total_size	= 4096,
--		.page_size	= 256,
--		.feature_bits	= FEATURE_WRSR_WREN,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {64 * 1024, 64} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 64} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {4 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {4 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_bp2_srwd, /* bit6: error flag */
--		.unlock		= spi_disable_blockprotect,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
- 		.name		= "MX25L3205D/MX25L3208D",
- 		.bustype	= BUS_SPI,
- 		.manufacture_id	= MACRONIX_ID,
-@@ -7703,84 +7594,6 @@ const struct flashchip flashchips[] = {
- 
- 	{
- 		.vendor		= "Macronix",
--		.name		= "MX25L3206E/MX25L3208E",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L3205,
--		.total_size	= 4096,
--		.page_size	= 256,
--		/* OTP: 64B total; enter 0xB1, exit 0xC1 */
--		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {4 * 1024, 1024} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 64} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {64 * 1024, 64} },
--				.block_erase = spi_block_erase_52,
--			}, {
--				.eraseblocks = { {4 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {4 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_bp3_srwd,
--		.unlock		= spi_disable_blockprotect_bp3_srwd,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) and dual I/O supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
--		.name		= "MX25L3273E",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L3205,
--		.total_size	= 4096,
--		.page_size	= 256,
--		/* OTP: 64B total; enter 0xB1, exit 0xC1 */
--		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {4 * 1024, 1024} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {32 * 1024, 128} },
--				.block_erase = spi_block_erase_52,
--			}, {
--				.eraseblocks = { {64 * 1024, 64} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {4 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {4 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			},
--		},
--		.printlock	= spi_prettyprint_status_register_bp3_srwd,
--		.unlock		= spi_disable_blockprotect_bp3_srwd,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) and dual I/O supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
- 		.name		= "MX25L3235D",
- 		.bustype	= BUS_SPI,
- 		.manufacture_id	= MACRONIX_ID,
-@@ -7817,42 +7630,6 @@ const struct flashchip flashchips[] = {
- 
- 	{
- 		.vendor		= "Macronix",
--		.name		= "MX25L6405",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L6405,
--		.total_size	= 8192,
--		.page_size	= 256,
--		/* Has an additional 512B EEPROM sector */
--		.feature_bits	= FEATURE_WRSR_WREN,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {64 * 1024, 128} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 128} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {8 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {8 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			}
--		},
--		.printlock	= spi_prettyprint_status_register_bp3_srwd, /* bit6: error flag */
--		.unlock		= spi_disable_blockprotect_bp3_srwd,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
- 		.name		= "MX25L6405D",
- 		.bustype	= BUS_SPI,
- 		.manufacture_id	= MACRONIX_ID,
-@@ -7889,86 +7666,6 @@ const struct flashchip flashchips[] = {
- 
- 	{
- 		.vendor		= "Macronix",
--		.name		= "MX25L6406E/MX25L6408E",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L6405,
--		.total_size	= 8192,
--		.page_size	= 256,
--		/* MX25L6406E supports SFDP */
--		/* OTP: 06E 64B total; enter 0xB1, exit 0xC1 */
--		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {4 * 1024, 2048} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {64 * 1024, 128} },
--				.block_erase = spi_block_erase_52,
--			}, {
--				.eraseblocks = { {64 * 1024, 128} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {8 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {8 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			}
--		},
--		.printlock	= spi_prettyprint_status_register_bp3_srwd,
--		.unlock		= spi_disable_blockprotect_bp3_srwd,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B), dual I/O read supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
--		.name		= "MX25L6436E/MX25L6445E/MX25L6465E/MX25L6473E",
--		.bustype	= BUS_SPI,
--		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L6405,
--		.total_size	= 8192,
--		.page_size	= 256,
--		/* supports SFDP */
--		/* OTP: 512B total; enter 0xB1, exit 0xC1 */
--		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
--		.tested		= TEST_OK_PREW,
--		.probe		= probe_spi_rdid,
--		.probe_timing	= TIMING_ZERO,
--		.block_erasers	=
--		{
--			{
--				.eraseblocks = { {4 * 1024, 2048} },
--				.block_erase = spi_block_erase_20,
--			}, {
--				.eraseblocks = { {32 * 1024, 256} },
--				.block_erase = spi_block_erase_52,
--			}, {
--				.eraseblocks = { {64 * 1024, 128} },
--				.block_erase = spi_block_erase_d8,
--			}, {
--				.eraseblocks = { {8 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_60,
--			}, {
--				.eraseblocks = { {8 * 1024 * 1024, 1} },
--				.block_erase = spi_block_erase_c7,
--			}
--		},
--		.printlock	= spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */
--		.unlock		= spi_disable_blockprotect_bp3_srwd,
--		.write		= spi_chip_write_256,
--		.read		= spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
--		.voltage	= {2700, 3600},
--	},
--
--	{
--		.vendor		= "Macronix",
- 		.name		= "MX25L12805D",
- 		.bustype	= BUS_SPI,
- 		.manufacture_id	= MACRONIX_ID,
--- 
-1.9.1
-
diff --git a/projects/flashrom/patches/0004-Whitelist-ThinkPad-W500.patch b/projects/flashrom/patches/0004-Whitelist-ThinkPad-W500.patch
deleted file mode 100644
index bb1c2bc3..00000000
--- a/projects/flashrom/patches/0004-Whitelist-ThinkPad-W500.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8c970dcf19661bc3d128a10e3ca79c24b4479186 Mon Sep 17 00:00:00 2001
-From: Gauvain Roussel-Tarbouriech <govanify@protonmail.com>
-Date: Sat, 29 Apr 2017 19:01:11 +0200
-Subject: [PATCH 1/1] Whitelist ThinkPad W500
-
----
- board_enable.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/board_enable.c b/board_enable.c
-index fc99615..a418e4f 100644
---- a/board_enable.c
-+++ b/board_enable.c
-@@ -2430,6 +2430,7 @@ const struct board_match board_matches[] = {
-     {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad R400", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad R400",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T400", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T400",         0,   OK, p2_whitelist_laptop},
-     {0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad T500", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad T500",         0,   OK, p2_whitelist_laptop},
-+	{0x8086, 0x2917, 0x17AA, 0x20F5,  0x8086, 0x2930, 0x17AA, 0x20F9, "^ThinkPad W500", NULL, NULL,      P2, "IBM/Lenovo",  "ThinkPad W500",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x1E22, 0x17AA, 0x21F6,  0x8086, 0x1E55, 0x17AA, 0x21F6, "^ThinkPad T530", NULL, NULL,       P2, "IBM/Lenovo",  "ThinkPad T530",         0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2015,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60",          0,   OK, p2_whitelist_laptop},
- 	{0x8086, 0x27a0, 0x17aa, 0x2017,  0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL,        P2, "IBM/Lenovo",  "ThinkPad T60(s)",       0,   OK, p2_whitelist_laptop},
--- 
-2.12.2
-
diff --git a/projects/flashrom/patches/lenovobios/0001-Lenovobios-adaptation-for-Macronix-and-SST-chips.patch b/projects/flashrom/patches/lenovobios/0001-Lenovobios-adaptation-for-Macronix-and-SST-chips.patch
index 1cb843c9..2a383fd1 100644
--- a/projects/flashrom/patches/lenovobios/0001-Lenovobios-adaptation-for-Macronix-and-SST-chips.patch
+++ b/projects/flashrom/patches/lenovobios/0001-Lenovobios-adaptation-for-Macronix-and-SST-chips.patch
@@ -1,22 +1,21 @@
-From aa2dd05f61f6ca91212d7f6d4055486af6e01436 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <info@minifree.org>
-Date: Fri, 5 Aug 2016 22:40:49 +0200
+From 85eea125194414b6afc8053565bb333f06054421 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Fri, 2 Mar 2018 06:47:34 +0000
 Subject: [PATCH] Lenovobios adaptation for Macronix and SST chips
 
-Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
 ---
  flashchips.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/flashchips.c b/flashchips.c
-index e5ea181..f3a017c 100644
+index 7f85415..16b166b 100644
 --- a/flashchips.c
 +++ b/flashchips.c
-@@ -7454,12 +7454,12 @@ const struct flashchip flashchips[] = {
+@@ -7634,12 +7634,12 @@ const struct flashchip flashchips[] = {
  		.name		= "MX25L1605D/MX25L1608D/MX25L1673E",
  		.bustype	= BUS_SPI,
  		.manufacture_id	= MACRONIX_ID,
--		.model_id	= MACRONIX_MX25L1605,
+-		.model_id	= 0xDEAD,
 +		.model_id	= 0x14,
  		.total_size	= 2048,
  		.page_size	= 256,
@@ -27,7 +26,7 @@ index e5ea181..f3a017c 100644
  		.probe_timing	= TIMING_ZERO,
  		.block_erasers	=
  		{
-@@ -9857,7 +9857,7 @@ const struct flashchip flashchips[] = {
+@@ -10442,7 +10442,7 @@ const struct flashchip flashchips[] = {
  		},
  		.printlock	= spi_prettyprint_status_register_bp2_srwd,
  		.unlock		= spi_disable_blockprotect,
@@ -36,7 +35,7 @@ index e5ea181..f3a017c 100644
  		.read		= spi_chip_read, /* Fast read (0x0B), dual I/O supported */
  		.voltage	= {2700, 3600},
  	},
-@@ -12150,12 +12150,12 @@ const struct flashchip flashchips[] = {
+@@ -12735,12 +12735,12 @@ const struct flashchip flashchips[] = {
  		.name		= "SST25VF016B",
  		.bustype	= BUS_SPI,
  		.manufacture_id	= SST_ID,
@@ -51,7 +50,7 @@ index e5ea181..f3a017c 100644
  		.probe_timing	= TIMING_ZERO,
  		.block_erasers	=
  		{
-@@ -12178,7 +12178,7 @@ const struct flashchip flashchips[] = {
+@@ -12763,7 +12763,7 @@ const struct flashchip flashchips[] = {
  		},
  		.printlock	= spi_prettyprint_status_register_sst25vf016,
  		.unlock		= spi_disable_blockprotect,
@@ -61,5 +60,5 @@ index e5ea181..f3a017c 100644
  		.voltage	= {2700, 3600},
  	},
 -- 
-2.9.0
+1.9.1
 
diff --git a/projects/grub/configs/bios/modules-minimal b/projects/grub/configs/bios/modules-minimal
index ea936115..706aa529 100644
--- a/projects/grub/configs/bios/modules-minimal
+++ b/projects/grub/configs/bios/modules-minimal
@@ -1,8 +1,14 @@
+ahci
 biosdisk
+cbfs
 cbmemc
+configfile
+ehci
 ext2
 halt
+loadenv
 part_bsd
 part_gpt
+pata
 reboot
 verify
diff --git a/projects/grub/configs/coreboot/modules-minimal b/projects/grub/configs/coreboot/modules-minimal
index 310aef86..0480a0d0 100644
--- a/projects/grub/configs/coreboot/modules-minimal
+++ b/projects/grub/configs/coreboot/modules-minimal
@@ -1,8 +1,11 @@
 ahci
+cbfs
 cbmemc
+configfile
 ehci
 ext2
 halt
+loadenv
 part_bsd
 part_gpt
 pata
diff --git a/projects/grub/configs/uefi/modules-minimal b/projects/grub/configs/uefi/modules-minimal
index 310aef86..0480a0d0 100644
--- a/projects/grub/configs/uefi/modules-minimal
+++ b/projects/grub/configs/uefi/modules-minimal
@@ -1,8 +1,11 @@
 ahci
+cbfs
 cbmemc
+configfile
 ehci
 ext2
 halt
+loadenv
 part_bsd
 part_gpt
 pata
diff --git a/projects/grub/grub-helper b/projects/grub/grub-helper
index dd069290..596f7d96 100755
--- a/projects/grub/grub-helper
+++ b/projects/grub/grub-helper
@@ -128,6 +128,9 @@ grub_build_bootable_image() {
 	local format="$(grub_format "$target" "$@")"
 	local prefix="$(grub_prefix "$target" "$@")"
 	local config_path="$(grub_config_path "$target" "$@")"
+	local modmin_path="$(grub_modmin_path "$target" "$@")"
+
+	local -a modmin=($(< "$modmin_path"))
 
 	local grub_mkimage="$sources_path/grub-mkimage"
 	local grub_module_dir="$sources_path/grub-core"
@@ -142,7 +145,7 @@ grub_build_bootable_image() {
 		--output="$grubimg" \
 		--format="$format" \
 		--prefix="$prefix" \
-		cbfs configfile
+		"${modmin[@]}"
 
 	cat "$grub_bootimg" "$grubimg" > "$grub_bootable_img"
 	rm -f "$grubimg"
@@ -181,7 +184,7 @@ grub_build_floppy_image() {
 		mv "$tempfile" "$grubimg"
 	else
 		printf '\n%s' "Error: Image ${grubimg##*/} is too large; " 1>&2
-		printf '%s\n\n' "it must be less than ${size}KiB in size" 1>&2
+		printf '%s\n\n' "it must be less than ${floppy_size}KiB in size" 1>&2
 
 		return 1
 	fi
@@ -192,6 +195,9 @@ grub_build_standalone_image() {
 	local format="$(grub_format "$target" "$@")"
 	local prefix="$(grub_prefix "$target" "$@")"
 	local config_path="$(grub_config_path "$target" "$@")"
+	local modmin_path="$(grub_modmin_path "$target" "$@")"
+
+	local -a modmin=($(< "$modmin_path"))
 
 	local grubimg="$build_path/grub2"
 
@@ -204,7 +210,7 @@ grub_build_standalone_image() {
 		--fonts='' \
 		--themes='' \
 		--locales='' \
-		--install-modules='cbfs configfile' \
+		--install-modules="${modmin[*]}" \
 		--directory="$grub_module_dir" \
 		--format="$format" \
 		--output="$grubimg" \
diff --git a/projects/grub/patches/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch b/projects/grub/patches/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch
new file mode 100644
index 00000000..1d537e87
--- /dev/null
+++ b/projects/grub/patches/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch
@@ -0,0 +1,73 @@
+From 8dde1d7be2dd321a375570b7ff7e22bb01293044 Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis@fe80.eu>
+Date: Fri, 4 Dec 2015 17:10:42 +0100
+Subject: [PATCH 08/10] mkstandalone: add argument --fixed-time to override
+ mtime of files
+
+mkstandalone adds several files to an archive. Doing this it uses the
+mtime to give these files a timestamp.
+--fixed-time <TIME_EPOCH> overrides these timestamps with a given.
+
+Replacing all timestamps with a specific one is required
+to get reproducible builds. See source epoch specification of
+reproducible-builds.org
+---
+ util/grub-mkstandalone.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
+index 4907d44..047f0cd 100644
+--- a/util/grub-mkstandalone.c
++++ b/util/grub-mkstandalone.c
+@@ -30,6 +30,7 @@
+ #pragma GCC diagnostic error "-Wmissing-prototypes"
+ #pragma GCC diagnostic error "-Wmissing-declarations"
+ 
++static time_t fixed_time;
+ static char *output_image;
+ static char **files;
+ static int nfiles;
+@@ -48,6 +49,7 @@ static struct argp_option options[] = {
+    0, N_("save output in FILE [required]"), 2},
+   {"format", 'O', N_("FILE"), 0, 0, 2},
+   {"compression", 'C', "xz|none|auto", OPTION_HIDDEN, 0, 2},
++  {"fixed-time", 't', N_("TIMEEPOCH"), 0, N_("Use a fixed timestamp to override mtime of all files. Time since epoch is used."), 2},
+   {0, 0, 0, 0, 0, 0}
+ };
+ 
+@@ -72,6 +74,7 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
+ static error_t
+ argp_parser (int key, char *arg, struct argp_state *state)
+ {
++  char *b;
+   if (key == 'C')
+     key = GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS;
+ 
+@@ -80,6 +83,14 @@ argp_parser (int key, char *arg, struct argp_state *state)
+ 
+   switch (key)
+     {
++    case 't':
++      fixed_time = strtoll (arg, &b, 10);
++      if (*b !='\0') {
++        printf (_("invalid fixed time number: %s\n"), arg);
++        argp_usage (state);
++        exit (1);
++      }
++      break;
+ 
+     case 'o':
+       if (output_image)
+@@ -192,7 +203,8 @@ add_tar_file (const char *from,
+   if (grub_util_is_special_file (from))
+     return;
+ 
+-  mtime = grub_util_get_mtime (from);
++  /* use fixed_time if given for mtime */
++  mtime = fixed_time != -1 ? fixed_time : grub_util_get_mtime (from);
+ 
+   optr = tcn = xmalloc (strlen (to) + 1);
+   for (iptr = to; *iptr == '/'; iptr++);
+-- 
+1.9.1
+
diff --git a/projects/grub/patches/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch b/projects/grub/patches/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch
new file mode 100644
index 00000000..0612ade0
--- /dev/null
+++ b/projects/grub/patches/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch
@@ -0,0 +1,68 @@
+From 0f1e1a29d4d019e7b2b1a3ac3db7ca22c75e8d88 Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis@fe80.eu>
+Date: Fri, 4 Dec 2015 17:10:43 +0100
+Subject: [PATCH 09/10] mkrescue: add argument --fixed-time to get reproducible
+ uuids
+
+The uuid generation is based on the time.
+---
+ util/grub-mkrescue.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
+index 238d484..a3e0155 100644
+--- a/util/grub-mkrescue.c
++++ b/util/grub-mkrescue.c
+@@ -52,6 +52,7 @@ static int xorriso_arg_alloc;
+ static char **xorriso_argv;
+ static char *iso_uuid;
+ static char *iso9660_dir;
++static time_t fixed_time;
+ 
+ static void
+ xorriso_push (const char *val)
+@@ -110,6 +111,7 @@ static struct argp_option options[] = {
+   {"product-version", OPTION_PRODUCT_VERSION, N_("STRING"), 0, N_("use STRING as product version"), 2},
+   {"sparc-boot", OPTION_SPARC_BOOT, 0, 0, N_("enable sparc boot. Disables HFS+, APM, ARCS and boot as disk image for i386-pc"), 2},
+   {"arcs-boot", OPTION_ARCS_BOOT, 0, 0, N_("enable ARCS (big-endian mips machines, mostly SGI) boot. Disables HFS+, APM, sparc64 and boot as disk image for i386-pc"), 2},
++  {"fixed-time", 't', N_("TIMEEPOCH"), 0, N_("use a fixed timestamp for uuid generation"), 2},
+   {0, 0, 0, 0, 0, 0}
+ };
+ 
+@@ -153,6 +155,8 @@ enum {
+ static error_t 
+ argp_parser (int key, char *arg, struct argp_state *state)
+ {
++  char *b;
++
+   if (grub_install_parse (key, arg))
+     return 0;
+   switch (key)
+@@ -212,6 +216,15 @@ argp_parser (int key, char *arg, struct argp_state *state)
+       xorriso = xstrdup (arg);
+       return 0;
+ 
++    case 't':
++      fixed_time = strtoll (arg, &b, 10);
++      if (*b !='\0') {
++        printf (_("invalid fixed time number: %s\n"), arg);
++        argp_usage (state);
++        exit (1);
++      }
++      return 0;
++
+     default:
+       return ARGP_ERR_UNKNOWN;
+     }
+@@ -542,7 +555,7 @@ main (int argc, char *argv[])
+   {
+     time_t tim;
+     struct tm *tmm;
+-    tim = time (NULL);
++    tim = fixed_time != -1 ? fixed_time : time (NULL);
+     tmm = gmtime (&tim);
+     iso_uuid = xmalloc (55);
+     grub_snprintf (iso_uuid, 50,
+-- 
+1.9.1
+
diff --git a/projects/grub/patches/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch b/projects/grub/patches/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch
new file mode 100644
index 00000000..f06dbfb5
--- /dev/null
+++ b/projects/grub/patches/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch
@@ -0,0 +1,30 @@
+From 57174ed960905be4f9c229bbf3913b25745dbfd9 Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis@fe80.eu>
+Date: Fri, 4 Dec 2015 17:10:44 +0100
+Subject: [PATCH 10/10] Makefile: use FIXED_TIMESTAMP for mkstandalone if set
+
+mkstandalone sets timestamps for files which can be overriden by a fixed_timestamp.
+This makes it possible to build reproducible builds for coreboot.
+
+To build a reproducible build of grub for coreboot do:
+make default_payload.elf FIXED_TIMESTAMP=1134242
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 00a9663..ed7f148 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -411,7 +411,7 @@ bootcheck: $(BOOTCHECKS)
+ if COND_i386_coreboot
+ default_payload.elf: grub-mkstandalone grub-mkimage FORCE
+ 	test -f $@ && rm $@ || true
+-	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
++	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg $(if $(FIXED_TIMESTAMP),-t $(FIXED_TIMESTAMP))
+ endif
+ 
+ endif
+-- 
+1.9.1
+
diff --git a/projects/hdctools/configs/revision b/projects/hdctools/configs/revision
index 79d3a325..6ce6b84b 100644
--- a/projects/hdctools/configs/revision
+++ b/projects/hdctools/configs/revision
@@ -1 +1 @@
-origin/release-R56-9000.B
+origin/release-R65-10323.B
diff --git a/projects/ich9gen/configs/install b/projects/ich9gen/configs/install
new file mode 100644
index 00000000..ef6e0b0e
--- /dev/null
+++ b/projects/ich9gen/configs/install
@@ -0,0 +1,9 @@
+ich9fdgbe_4m.bin:ich9fdgbe_4m.bin
+ich9fdgbe_8m.bin:ich9fdgbe_8m.bin
+ich9fdgbe_16m.bin:ich9fdgbe_16m.bin
+ich9fdnogbe_4m.bin:ich9fdnogbe_4m.bin
+ich9fdnogbe_8m.bin:ich9fdnogbe_8m.bin
+ich9fdnogbe_16m.bin:ich9fdnogbe_16m.bin
+ich9gen:ich9gen
+mkgbe.c:mkgbe.c
+mkgbe.h:mkgbe.h
diff --git a/projects/ich9gen/configs/macaddress b/projects/ich9gen/configs/macaddress
new file mode 100644
index 00000000..2ca03841
--- /dev/null
+++ b/projects/ich9gen/configs/macaddress
@@ -0,0 +1 @@
+00:4c:69:62:72:65
diff --git a/projects/ich9gen/ich9gen b/projects/ich9gen/ich9gen
new file mode 100755
index 00000000..71567329
--- /dev/null
+++ b/projects/ich9gen/ich9gen
@@ -0,0 +1,107 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
+#
+# 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/>.
+
+arguments() {
+	project_arguments_targets "$project" "$@"
+}
+
+usage() {
+	project_usage_actions "$project"
+	project_usage_arguments "$project" "$@"
+}
+
+extract() {
+	local repository="$project"
+
+	project_extract "$project" "$@"
+}
+
+extract_check() {
+	local repository="$project"
+
+	project_extract_check "$project" "$@"
+}
+
+update() {
+	local repository="$project"
+
+	project_update_git "$project" "$repository" "$@"
+}
+
+update_check() {
+	local repository="$project"
+
+	project_update_check_git "$project" "$repository" "$@"
+}
+
+build() {
+	local repository="$project"
+
+	project_sources_directory_missing_empty_error "$project" "$repository" "$@"
+
+	if git_project_check "$repository"; then
+		git_project_checkout "$project" "$repository" "$@"
+	fi
+
+	local sources_path="$(project_sources_path "$project" "$repository" "$@")"
+
+	local build_path="$(project_build_path "$project" "$@")"
+
+	mkdir -p "$build_path"
+	make -C "$sources_path" -j"$TASKS" ich9gen
+
+	(
+		local macaddress="$(ich9gen_macaddress)"
+
+		cd "$build_path"
+
+		if [[ -n $macaddress ]]; then
+			"$sources_path"/ich9gen --macaddress "$macaddress"
+		else
+			"$sources_path"/ich9gen
+		fi
+	)
+
+	cp "$sources_path/ich9gen" "$build_path"
+	make -C "$sources_path" clean
+}
+
+build_check() {
+	project_build_check "$project" "$@"
+}
+
+install() {
+	project_install "$project" "$@"
+}
+
+install_check() {
+	project_install_check "$project" "$@"
+}
+
+release() {
+	project_release_install_archive "$project" "$TOOLS" "$@"
+	project_release_sources_archive_create "$project" "$@"
+}
+
+release_check() {
+	project_release_install_archive_check "$project" "$TOOLS" "$@"
+	project_release_sources_archive_exists_check "$project" "$@"
+}
+
+clean() {
+	project_clean "$project" "$@"
+}
diff --git a/projects/ich9gen/ich9gen-helper b/projects/ich9gen/ich9gen-helper
new file mode 100755
index 00000000..d97af0af
--- /dev/null
+++ b/projects/ich9gen/ich9gen-helper
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2018 Andrew Robbins <contact@andrewrobbins.info>
+#
+# 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/>.
+
+MACADDRESS='macaddress'
+
+ich9gen_macaddress() {
+	project_file_contents "$project" "$CONFIGS" "$MACADDRESS" "$@"
+}
diff --git a/projects/ich9gen/sources/Makefile b/projects/ich9gen/sources/Makefile
new file mode 100644
index 00000000..ba4e53f9
--- /dev/null
+++ b/projects/ich9gen/sources/Makefile
@@ -0,0 +1,94 @@
+#
+# Makefile for ich9deblob utility from libreboot project
+#
+# Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+#
+# 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/>.
+#
+
+CC=gcc
+FORCEC99=-std=c99
+CFLAGS=-I. -Wall -Wextra -g $(FORCEC99)
+NOLINKER=-c
+
+.PHONY: all clean
+
+all: ich9deblob ich9gen demefactory
+
+ich9deblob: obj/ich9deblob.o obj/common/descriptor_gbe.o \
+		obj/descriptor/descriptor.o obj/gbe/gbe.o obj/common/x86compatibility.o
+
+	$(CC) $(CFLAGS) obj/ich9deblob.o obj/common/descriptor_gbe.o \
+		obj/common/x86compatibility.o obj/descriptor/descriptor.o obj/gbe/gbe.o \
+		 -o ich9deblob
+
+ich9gen: obj/ich9gen.o obj/ich9gen/mkdescriptor.o obj/ich9gen/mkgbe.o \
+		obj/common/descriptor_gbe.o \
+		obj/descriptor/descriptor.o obj/gbe/gbe.o obj/common/x86compatibility.o
+
+	$(CC) $(CFLAGS) obj/ich9gen.o obj/ich9gen/mkdescriptor.o obj/ich9gen/mkgbe.o \
+	 obj/common/descriptor_gbe.o \
+		obj/common/x86compatibility.o obj/descriptor/descriptor.o obj/gbe/gbe.o \
+		 -o ich9gen
+
+demefactory: obj/demefactory.o obj/common/descriptor_gbe.o \
+		obj/descriptor/descriptor.o obj/gbe/gbe.o obj/common/x86compatibility.o
+
+	$(CC) $(CFLAGS) obj/demefactory.o obj/common/descriptor_gbe.o \
+		obj/common/x86compatibility.o obj/descriptor/descriptor.o obj/gbe/gbe.o \
+		 -o demefactory
+
+# for demefactory
+# ----------------------------------------------------------------------
+
+obj/demefactory.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/demefactory.c -o obj/demefactory.o
+
+# for ich9deblob
+# ----------------------------------------------------------------------
+
+obj/ich9deblob.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/ich9deblob.c -o obj/ich9deblob.o
+
+# for ich9gen
+# ----------------------------------------------------------------------
+
+obj/ich9gen.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/ich9gen.c -o obj/ich9gen.o
+
+obj/ich9gen/mkdescriptor.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/ich9gen/mkdescriptor.c -o obj/ich9gen/mkdescriptor.o
+
+obj/ich9gen/mkgbe.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/ich9gen/mkgbe.c -o obj/ich9gen/mkgbe.o
+
+# for demefactory, ich9deblob and ich9gen:
+# ----------------------------------------------------------------------
+
+obj/common/descriptor_gbe.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/common/descriptor_gbe.c -o obj/common/descriptor_gbe.o
+
+obj/common/x86compatibility.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/common/x86compatibility.c -o obj/common/x86compatibility.o
+
+obj/descriptor/descriptor.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/descriptor/descriptor.c -o obj/descriptor/descriptor.o
+
+obj/gbe/gbe.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/gbe/gbe.c -o obj/gbe/gbe.o
+
+# make clean
+# ----------------------------------------------------------------------
+clean:
+	rm -Rf ich9deblob ich9gen demefactory obj/*.o obj/*/*.o
diff --git a/projects/ich9gen/sources/obj/.empty b/projects/ich9gen/sources/obj/.empty
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/projects/ich9gen/sources/obj/.empty
diff --git a/projects/ich9gen/sources/obj/common/.empty b/projects/ich9gen/sources/obj/common/.empty
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/projects/ich9gen/sources/obj/common/.empty
diff --git a/projects/ich9gen/sources/obj/descriptor/.empty b/projects/ich9gen/sources/obj/descriptor/.empty
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/projects/ich9gen/sources/obj/descriptor/.empty
diff --git a/projects/ich9gen/sources/obj/gbe/.empty b/projects/ich9gen/sources/obj/gbe/.empty
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/projects/ich9gen/sources/obj/gbe/.empty
diff --git a/projects/ich9gen/sources/obj/ich9gen/.empty b/projects/ich9gen/sources/obj/ich9gen/.empty
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/projects/ich9gen/sources/obj/ich9gen/.empty
diff --git a/projects/ich9gen/sources/src/common/descriptor_gbe.c b/projects/ich9gen/sources/src/common/descriptor_gbe.c
new file mode 100644
index 00000000..bce8afc3
--- /dev/null
+++ b/projects/ich9gen/sources/src/common/descriptor_gbe.c
@@ -0,0 +1,90 @@
+/*
+ *  descriptor_gbe.c
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ * Purpose: common descriptor/gbe functions used by ich9deblob
+ *
+ *  Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *
+ *  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/>.
+ */
+
+#include "descriptor_gbe.h"
+
+/*
+ * create 12KiB file with descriptor, and then gbe immediately after.
+ */
+int notCreatedDescriptorGbeFile(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k, char* fileName)
+{
+	FILE* fileStream = NULL;
+
+	/* delete old file before continuing */
+	remove(fileName);
+
+	/* open new file for writing the descriptor+gbe */
+	fileStream = fopen(fileName, "ab");
+
+	/* write the descriptor region into the first part */
+	if (DESCRIPTORREGIONSIZE != fwrite((uint8_t*)&descriptorStruct, 1, sizeof(descriptorStruct), fileStream))
+	{
+		printf("\nerror: writing descriptor region failed\n");
+		return 1;
+	}
+
+	/* add gbe to the end of the file */
+	if (GBEREGIONSIZE_8K != fwrite((uint8_t*)&gbeStruct8k, 1, sizeof(gbeStruct8k), fileStream))
+	{
+		printf("\nerror: writing GBe region failed\n");
+		return 1;
+	}
+
+	fclose(fileStream);
+
+	printf("descriptor and gbe successfully written to the file: %s\n", fileName);
+	printf("Now do: dd if=%s of=libreboot.rom bs=1 count=12k conv=notrunc\n", fileName);
+	printf("(in other words, add the modified descriptor+gbe to your ROM image)\n\n");
+
+	return 0;
+}
+
+/*
+ * create 4KiB file with descriptor
+ */
+int notCreated4kDescriptorFile(struct DESCRIPTORREGIONRECORD descriptorStruct, char* fileName)
+{
+	FILE* fileStream = NULL;
+
+	/* delete old file before continuing */
+	remove(fileName);
+
+	/* open new file for writing the descriptor+gbe */
+	fileStream = fopen(fileName, "ab");
+
+	/* write the descriptor region into the first part */
+	if (DESCRIPTORREGIONSIZE != fwrite((uint8_t*)&descriptorStruct, 1, sizeof(descriptorStruct), fileStream))
+	{
+		printf("\nerror: writing descriptor region failed\n");
+		return 1;
+	}
+
+
+	fclose(fileStream);
+
+	printf("descriptor successfully written to the file: %s\n", fileName);
+	printf("Now do: dd if=%s of=yourrom.rom bs=1 count=4k conv=notrunc\n", fileName);
+	printf("(in other words, add the modified descriptor to your ROM image)\n\n");
+
+	return 0;
+}
diff --git a/projects/ich9gen/sources/src/common/descriptor_gbe.h b/projects/ich9gen/sources/src/common/descriptor_gbe.h
new file mode 100644
index 00000000..ff685720
--- /dev/null
+++ b/projects/ich9gen/sources/src/common/descriptor_gbe.h
@@ -0,0 +1,37 @@
+/*
+ *  gbe_descriptor.h
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ * Purpose: header file for descriptor_gbe.c
+ *
+ *  Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *
+ *  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/>.
+ */
+
+#ifndef COMMON_DESCRIPTOR_GBE_H
+#define COMMON_DESCRIPTOR_GBE_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "../descriptor/descriptor.h" /* structs describing what's in the descriptor region */
+#include "../gbe/gbe.h"               /* structs describing what's in the gbe region */
+
+int notCreatedDescriptorGbeFile(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k, char* fileName);
+int notCreated4kDescriptorFile(struct DESCRIPTORREGIONRECORD descriptorStruct, char* fileName);
+
+#endif
diff --git a/projects/ich9gen/sources/src/common/x86compatibility.c b/projects/ich9gen/sources/src/common/x86compatibility.c
new file mode 100644
index 00000000..522f3e29
--- /dev/null
+++ b/projects/ich9gen/sources/src/common/x86compatibility.c
@@ -0,0 +1,161 @@
+/*
+ *  x86compatibility.c
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ * Purpose: compiler/cpu compatibility checks. ich9deblob is not portable, yet.
+ *
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *                     Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+#include "x86compatibility.h"
+
+/*
+ * ---------------------------------------------------------------------
+ * x86 compatibility checking:
+ * ---------------------------------------------------------------------
+ */
+
+/* fail if struct size is incorrect */
+int structSizesIncorrect(struct DESCRIPTORREGIONRECORD descriptorDummy, struct GBEREGIONRECORD_8K gbe8kDummy)
+{
+	unsigned int descriptorRegionStructSize = sizeof(descriptorDummy);
+	unsigned int gbeRegion8kStructSize = sizeof(gbe8kDummy);
+
+	/* check compiler bit-packs in a compatible way. basically, it is expected that this code will be used on x86 */
+	if (DESCRIPTORREGIONSIZE != descriptorRegionStructSize){
+		printf("\nerror: compiler incompatibility: descriptor struct length is %i bytes (should be %i)\n", descriptorRegionStructSize, DESCRIPTORREGIONSIZE);
+		return 1;
+	}
+	if (GBEREGIONSIZE_8K != gbeRegion8kStructSize){
+		printf("\nerror: compiler incompatibility: gbe struct length is %i bytes (should be %i)\n", gbeRegion8kStructSize, GBEREGIONSIZE_8K);
+		return 1;
+	}
+
+	return 0;
+}
+
+/* fail if members are presented in the wrong order */
+int structMembersWrongOrder()
+{
+	int i;
+	struct DESCRIPTORREGIONRECORD descriptorDummy;
+	uint8_t *meVsccTablePtr = (uint8_t*)&descriptorDummy.meVsccTable;
+
+	/* These do not use bitfields.  */
+	descriptorDummy.meVsccTable.jid0 = 0x01020304;  /* unsigned int 32-bit */
+	descriptorDummy.meVsccTable.vscc0 = 0x10203040; /* unsigned int 32-bit */
+	descriptorDummy.meVsccTable.jid1 = 0x11223344;  /* unsigned int 32-bit */
+	descriptorDummy.meVsccTable.vscc1 = 0x05060708; /* unsigned int 32-bit */
+	descriptorDummy.meVsccTable.jid2 = 0x50607080;  /* unsigned int 32-bit */
+	descriptorDummy.meVsccTable.vscc2 = 0x55667788; /* unsigned int 32-bit */
+	descriptorDummy.meVsccTable.padding[0] = 0xAA;  /* unsigned char 8-bit */
+	descriptorDummy.meVsccTable.padding[1] = 0xBB;  /* unsigned char 8-bit */
+	descriptorDummy.meVsccTable.padding[2] = 0xCC;  /* unsigned char 8-bit */
+	descriptorDummy.meVsccTable.padding[3] = 0xDD;  /* unsigned char 8-bit */
+
+	/*
+	 * Look from the top down, and concatenate the unsigned ints but
+	 * with each unsigned in little endian order.
+	 * Then, concatenate the unsigned chars in big endian order. (in the padding array)
+	 *
+	 * combined, these should become:
+	 * 01020304 10203040 11223344 05060708 50607080 55667788 AA BB CC DD (ignore this. big endian. just working it out manually:)
+	 * 04030201 40302010 44332211 08070605 80706050 88776655 AA BB CC DD (ignore this. not byte-separated, just working it out:)
+	 * 04 03 02 01 40 30 20 10 44 33 22 11 08 07 06 05 80 70 60 50 88 77 66 55 AA BB CC DD <-- it should match this
+	 */
+
+	if (
+			!
+			(
+				*meVsccTablePtr      == 0x04 && *(meVsccTablePtr+1)  == 0x03 && *(meVsccTablePtr+2)  == 0x02 && *(meVsccTablePtr+3)  == 0x01
+			&& *(meVsccTablePtr+4)  == 0x40 && *(meVsccTablePtr+5)  == 0x30 && *(meVsccTablePtr+6)  == 0x20 && *(meVsccTablePtr+7)  == 0x10
+			&& *(meVsccTablePtr+8)  == 0x44 && *(meVsccTablePtr+9)  == 0x33 && *(meVsccTablePtr+10) == 0x22 && *(meVsccTablePtr+11) == 0x11
+			&& *(meVsccTablePtr+12) == 0x08 && *(meVsccTablePtr+13) == 0x07 && *(meVsccTablePtr+14) == 0x06 && *(meVsccTablePtr+15) == 0x05
+			&& *(meVsccTablePtr+16) == 0x80 && *(meVsccTablePtr+17) == 0x70 && *(meVsccTablePtr+18) == 0x60 && *(meVsccTablePtr+19) == 0x50
+			&& *(meVsccTablePtr+20) == 0x88 && *(meVsccTablePtr+21) == 0x77 && *(meVsccTablePtr+22) == 0x66 && *(meVsccTablePtr+23) == 0x55
+			&& *(meVsccTablePtr+24) == 0xAA && *(meVsccTablePtr+25) == 0xBB && *(meVsccTablePtr+26) == 0xCC && *(meVsccTablePtr+27) == 0xDD
+	      )
+	   ) {
+
+		printf("\nStruct member order check (descriptorDummy.meVsccTable) with junk/dummy data:");
+		printf("\nShould be: 04 03 02 01 40 30 20 10 44 33 22 11 08 07 06 05 80 70 60 50 88 77 66 55 aa bb cc dd ");
+		printf("\nAnd it is: ");
+
+		for (i = 0; i < 28; i++) {
+			printf("%02x ", *(meVsccTablePtr + i));
+		}
+		printf("\nIncorrect order.\n");
+
+		return 1;
+	}
+
+	return 0;
+}
+
+/* fail if bit fields are presented in the wrong order */
+int structBitfieldWrongOrder()
+{
+	int i;
+	struct DESCRIPTORREGIONRECORD descriptorDummy;
+	uint8_t *flMap0Ptr = (uint8_t*)&descriptorDummy.flMaps.flMap0;
+
+	descriptorDummy.flMaps.flMap0.FCBA = 0xA2;      /* :8 --> 10100010 */
+	descriptorDummy.flMaps.flMap0.NC = 0x02;        /* :2 --> 10       */
+	descriptorDummy.flMaps.flMap0.reserved1 = 0x38; /* :6 --> 111000   */
+	descriptorDummy.flMaps.flMap0.FRBA = 0xD2;      /* :8 --> 11010010 */
+	descriptorDummy.flMaps.flMap0.NR = 0x05;        /* :3 --> 101      */
+	descriptorDummy.flMaps.flMap0.reserved2 = 0x1C; /* :5 --> 11100    */
+
+	/*
+	 * Look from the top bottom up, and concatenate the binary strings.
+	 * Then, convert the 8-bit groups to hex and reverse the (8-bit)byte order
+	 *
+	 * combined, these should become (in memory), in binary:
+	 * 10100010 11100010 11010010 11100101
+	 * or in hex:
+	 * A2 E2 D2 E5
+	 */
+
+	if (!(*flMap0Ptr == 0xA2 && *(flMap0Ptr+1) == 0xE2 && *(flMap0Ptr+2) == 0xD2 && *(flMap0Ptr+3) == 0xE5))
+	{
+		printf("\nBitfield order check (descriptorDummy.flMaps.flMaps0) with junk/dummy data:");
+		printf("\nShould be: a2 e2 d2 e5 ");
+		printf("\nAnd it is: ");
+
+		for (i = 0; i < 4; i++) {
+			printf("%02x ", *(flMap0Ptr + i));
+		}
+		printf("\nIncorrect order.\n");
+
+		return 1;
+	}
+
+	return 0;
+}
+
+/* Compatibility checks. This version of ich9deblob is not yet porable. */
+int systemOrCompilerIncompatible(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k)
+{
+	if (structSizesIncorrect(descriptorStruct, gbeStruct8k)) return 1;
+	if (IS_BIG_ENDIAN) {
+		printf("big endian not supported\n");
+		return 1;
+	}
+	if (structBitfieldWrongOrder()) return 1;
+	if (structMembersWrongOrder()) return 1;
+	return 0;
+}
diff --git a/projects/ich9gen/sources/src/common/x86compatibility.h b/projects/ich9gen/sources/src/common/x86compatibility.h
new file mode 100644
index 00000000..a4829888
--- /dev/null
+++ b/projects/ich9gen/sources/src/common/x86compatibility.h
@@ -0,0 +1,42 @@
+/*
+ *  x86compatibility.h
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ * Purpose: keep gcc/make happy. no actual code here, just function definitions.
+ *
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *                     Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+#ifndef X86COMPATIBILITY_H
+#define X86COMPATIBILITY_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+/* http://esr.ibiblio.org/?p=5095 */
+#define IS_BIG_ENDIAN (*(uint16_t *)"\0\xff" < 0x100)
+
+#include "../descriptor/descriptor.h" /* structs describing what's in the descriptor region */
+#include "../gbe/gbe.h"               /* structs describing what's in the gbe region */
+
+int structSizesIncorrect(struct DESCRIPTORREGIONRECORD descriptorDummy, struct GBEREGIONRECORD_8K gbe8kDummy);
+int structMembersWrongOrder();
+int structBitfieldWrongOrder();
+int systemOrCompilerIncompatible(struct DESCRIPTORREGIONRECORD descriptorStruct, struct GBEREGIONRECORD_8K gbeStruct8k);
+
+#endif
diff --git a/projects/ich9gen/sources/src/demefactory.c b/projects/ich9gen/sources/src/demefactory.c
new file mode 100644
index 00000000..96bb0d41
--- /dev/null
+++ b/projects/ich9gen/sources/src/demefactory.c
@@ -0,0 +1,141 @@
+/*
+ *  demefactory.c
+ *  This file is part of the demefactory utility from the libreboot project
+ *
+ * Purpose: disable ME on GM45 factory firmware, but leave region intact
+ * 			enable read-write on all regions
+ *
+ *	 Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *
+ *  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/>.
+ */
+
+/*
+ * demfactory utility - main
+ */
+
+#include "demefactory.h"
+
+int main()
+{
+	struct DESCRIPTORREGIONRECORD descriptorStruct;
+	uint8_t* descriptorBuffer = (uint8_t*)&descriptorStruct;
+
+	struct GBEREGIONRECORD_8K gbeStruct8k; /* not needed, except for compatibility checking */
+
+	char* romFilename = "factory.rom";
+	char* descriptorFilename = "demefactory_4kdescriptor.bin";
+
+	unsigned int bufferLength;
+	unsigned int romSize;
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Compatibility checks. This version of ich9deblob is not yet portable.
+	 * ------------------------------------------------------------------
+	 */
+
+	if (systemOrCompilerIncompatible(descriptorStruct, gbeStruct8k)) return 1;
+	/* If true, fail with error message */
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Extract the descriptor region from the factory.rom dump
+	 * ------------------------------------------------------------------
+	 */
+	FILE* fp = NULL;
+	fp = fopen(romFilename, "rb"); /* open factory.rom */
+	if (NULL == fp)
+	{
+		printf("\nerror: could not open %s\n", romFilename);
+		fclose(fp);
+		return 1;
+	}
+	printf("\n%s opened successfully\n", romFilename);
+
+	/*
+	 * Get the descriptor region dump from the factory.rom
+	 * (goes in factoryDescriptorBuffer variable)
+	 */
+	bufferLength = fread(descriptorBuffer, 1, DESCRIPTORREGIONSIZE, fp);
+	if (DESCRIPTORREGIONSIZE != bufferLength) //
+	{
+		printf("\nerror: could not read descriptor from %s (%i) bytes read\n", romFilename, bufferLength);
+		fclose(fp);
+		return 1;
+	}
+	printf("\ndescriptor region read successfully\n");
+
+	/* ------------------------------------------------- */
+
+	fseek(fp, 0L, SEEK_END);
+	romSize = ftell(fp);
+	printf("\n%s size: [%i] bytes\n", romFilename, romSize);
+
+	/* -------------------------------------------------- */
+
+	fclose(fp);
+
+	/* Debugging (before modification) */
+	printDescriptorRegionLocations(descriptorStruct, "Original");
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Modify the descriptor region, ready to go in the modified factory.rom
+	 * ------------------------------------------------------------------
+	 */
+
+	// Disable the ME/TPM:
+	descriptorStruct = descriptorDisableMe(descriptorStruct);
+	descriptorStruct = descriptorDisableTpm(descriptorStruct);
+
+	/* Host/CPU is allowed to read/write all regions. */
+	descriptorStruct = descriptorHostRegionsUnlocked(descriptorStruct);
+	/* The ME is disallowed read-write access to all regions
+	 * (this is probably redundant, since the ME is already removed from libreboot) */
+	descriptorStruct = descriptorMeRegionsForbidden(descriptorStruct);
+
+	/* Debugging (after modifying the descriptor region) */
+	printDescriptorRegionLocations(descriptorStruct, "Modified");
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Create the file with the modified descriptor inside
+	 * ------------------------------------------------------------------
+	 */
+
+	printf("\n");
+	if (notCreated4kDescriptorFile(descriptorStruct, descriptorFilename)) {
+		return 1;
+	}
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Generate ich9gen data (C code that will recreate the deactivatedME descriptor from scratch)
+	 * ------------------------------------------------------------------
+	 */
+	/* Code for generating the Descriptor struct */
+	/* mkdescriptor.h */
+	if (notCreatedHFileForDescriptorCFile("mkdescriptor.h", "mkdescriptor.c")) {
+		return 1;
+	} /* and now mkdescriptor.c */
+	if (notCreatedCFileFromDescriptorStruct(descriptorStruct, "mkdescriptor.c", "mkdescriptor.h")) {
+		return 1;
+	}
+
+	printf("The modified descriptor region has also been dumped as src files: mkdescriptor.c, mkdescriptor.h\n\n");
+
+	return 0;
+}
diff --git a/projects/ich9gen/sources/src/demefactory.h b/projects/ich9gen/sources/src/demefactory.h
new file mode 100644
index 00000000..3478cef5
--- /dev/null
+++ b/projects/ich9gen/sources/src/demefactory.h
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (C) 2015 Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+/* Header file for demefactory.c */
+
+#ifndef DEMEFACTORY_H
+#define DEMEFACTORY_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "common/descriptor_gbe.h"   /* common descriptor/gbe functions used by ich9deblob */
+#include "common/x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */
+#include "descriptor/descriptor.h"   /* structs describing what's in the descriptor region */
+#include "gbe/gbe.h"                 /* structs describing what's in the gbe region */
+
+int main();
+
+#endif
diff --git a/projects/ich9gen/sources/src/descriptor/descriptor.c b/projects/ich9gen/sources/src/descriptor/descriptor.c
new file mode 100644
index 00000000..61ced67e
--- /dev/null
+++ b/projects/ich9gen/sources/src/descriptor/descriptor.c
@@ -0,0 +1,665 @@
+/*
+ *  descriptor/descriptor.c
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ *	 Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *
+ *  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/>.
+ */
+
+/*
+ * Provide descriptor related functions.
+ */
+
+/* structs describing the data in descriptor region */
+#include "descriptor.h"
+
+/*
+ * ---------------------------------------------------------------------
+ * Descriptor related functions
+ * ---------------------------------------------------------------------
+ */
+
+/* Set the Host CPU / BIOS region to have read-write access on all regions */
+struct DESCRIPTORREGIONRECORD descriptorHostRegionsUnlocked(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+   descriptorStruct.masterAccessSection.flMstr1.fdRegionReadAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.biosRegionReadAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.meRegionReadAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.gbeRegionReadAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.pdRegionReadAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.fdRegionWriteAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.biosRegionWriteAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.meRegionWriteAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.gbeRegionWriteAccess = 0x1;
+   descriptorStruct.masterAccessSection.flMstr1.pdRegionWriteAccess = 0x1;
+
+   return descriptorStruct;
+}
+
+/* Set the ME to have *no* read-write access on any region */
+struct DESCRIPTORREGIONRECORD descriptorMeRegionsForbidden(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+   descriptorStruct.masterAccessSection.flMstr2.fdRegionReadAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.biosRegionReadAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.meRegionReadAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.gbeRegionReadAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.pdRegionReadAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.fdRegionWriteAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.biosRegionWriteAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.meRegionWriteAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.gbeRegionWriteAccess = 0x0;
+   descriptorStruct.masterAccessSection.flMstr2.pdRegionWriteAccess = 0x0;
+
+   return descriptorStruct;
+}
+
+/* Disable (delete) the ME region */
+struct DESCRIPTORREGIONRECORD descriptorMeRegionRemoved(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	descriptorStruct.regionSection.flReg2.BASE = 0x1FFF;
+	descriptorStruct.regionSection.flReg2.LIMIT = 0;
+
+	return descriptorStruct;
+}
+
+/* Disable (delete) the Platform region */
+struct DESCRIPTORREGIONRECORD descriptorPlatformRegionRemoved(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	descriptorStruct.regionSection.flReg4.BASE = 0x1FFF;
+	descriptorStruct.regionSection.flReg4.LIMIT = 0;
+
+	return descriptorStruct;
+}
+
+/* Disable the ME in ICHSTRAP0 and MCHSTRAP0 */
+struct DESCRIPTORREGIONRECORD descriptorDisableMe(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	descriptorStruct.ichStraps.ichStrap0.meDisable = 1;
+	descriptorStruct.mchStraps.mchStrap0.meDisable = 1;
+
+	return descriptorStruct;
+}
+
+/* Disable the TPM in MCHSTRAP0 */
+struct DESCRIPTORREGIONRECORD descriptorDisableTpm(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	descriptorStruct.mchStraps.mchStrap0.tpmDisable = 1;
+
+	return descriptorStruct;
+}
+
+/* Relocate the Gbe region to begin at 4KiB (immediately after the flash descriptor) */
+struct DESCRIPTORREGIONRECORD descriptorMoveGbeToStart(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	descriptorStruct.regionSection.flReg3.BASE = DESCRIPTORREGIONSIZE >> FLREGIONBITSHIFT;
+	descriptorStruct.regionSection.flReg3.LIMIT = GBEREGIONSIZE_8K >> FLREGIONBITSHIFT;
+
+	return descriptorStruct;
+}
+
+/* Disable (delete) the GbE region */
+struct DESCRIPTORREGIONRECORD descriptorGbeRegionRemoved(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	descriptorStruct.regionSection.flReg3.BASE = 0x1FFF;
+	descriptorStruct.regionSection.flReg3.LIMIT = 0;
+
+	return descriptorStruct;
+}
+
+/* BIOS Region begin after descriptor+gbe at first 12KiB, fills the rest of the image */
+struct DESCRIPTORREGIONRECORD descriptorBiosRegionFillImageAfterGbe(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize)
+{
+	descriptorStruct.regionSection.flReg1.BASE = (DESCRIPTORREGIONSIZE + GBEREGIONSIZE_8K) >> FLREGIONBITSHIFT;
+	descriptorStruct.regionSection.flReg1.LIMIT = (romSize >> FLREGIONBITSHIFT) - 1;
+
+	return descriptorStruct;
+}
+
+/* BIOS Region begin after descriptor at first 4KiB, fills the rest of the image */
+struct DESCRIPTORREGIONRECORD descriptorBiosRegionFillImageAfterDescriptor(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize)
+{
+	descriptorStruct.regionSection.flReg1.BASE = DESCRIPTORREGIONSIZE >> FLREGIONBITSHIFT;
+	descriptorStruct.regionSection.flReg1.LIMIT = (romSize >> FLREGIONBITSHIFT) - 1;
+
+	return descriptorStruct;
+}
+
+/* Set OEM string to "LIBERATE" */
+struct DESCRIPTORREGIONRECORD descriptorOemString(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	descriptorStruct.oemSection.magicString[0] = 0x4C;
+	descriptorStruct.oemSection.magicString[1] = 0x49;
+	descriptorStruct.oemSection.magicString[2] = 0x42;
+	descriptorStruct.oemSection.magicString[3] = 0x45;
+	descriptorStruct.oemSection.magicString[4] = 0x52;
+	descriptorStruct.oemSection.magicString[5] = 0x41;
+	descriptorStruct.oemSection.magicString[6] = 0x54;
+	descriptorStruct.oemSection.magicString[7] = 0x45;
+
+	return descriptorStruct;
+}
+
+/* Check whether a GbE region is defined by this descriptor.
+ * Not thorough, but should work in most cases */
+int descriptorDefinesGbeRegion(struct DESCRIPTORREGIONRECORD descriptorStruct)
+{
+	if (
+		(descriptorStruct.regionSection.flReg3.BASE == 0x1FFF || descriptorStruct.regionSection.flReg3.BASE == 0xFFF)
+		&&
+		(descriptorStruct.regionSection.flReg3.LIMIT == 0)
+	)
+		return 0; /* has no GbE region */
+	else if (
+		descriptorStruct.ichStraps.ichStrap0.integratedGbe == 0
+		||
+		descriptorStruct.ichStraps.ichStrap0.lanPhy == 0
+	)
+		return 0; /* has no GbE region */
+	else
+		return 1; /* has a GbE region */
+}
+
+/* Configure the BIOS and GbE regions, as required by libreboot.
+ * Enable or disable the GbE region, based on what's in the descriptor */
+struct DESCRIPTORREGIONRECORD librebootSetGbeBiosDescriptorRegions(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize)
+{
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+	{
+		/*
+		 * set number of regions from 4 -> 2 (0 based, so 4 means 5 and 2
+		 * means 3. We want 3 regions: descriptor, gbe and bios, in that order)
+		 */
+		descriptorStruct.flMaps.flMap0.NR = 2;
+		/* Move GbE region to the start of the image (after the descriptor) */
+		descriptorStruct = descriptorMoveGbeToStart(descriptorStruct);
+		/* BIOS region fills the remaining space */
+		descriptorStruct = descriptorBiosRegionFillImageAfterGbe(descriptorStruct, romSize);
+
+		/* GbE region means that an Intel NIC is to be present */
+		descriptorStruct.ichStraps.ichStrap0.integratedGbe = 0x1;
+		descriptorStruct.ichStraps.ichStrap0.lanPhy = 0x1;
+	}
+	else {
+		/*
+		 * set number of regions from 4 -> 2 (0 based, so 4 means 5 and 1
+		 * means 2. We want 2 regions: descriptor and bios, in that order)
+		 */
+		descriptorStruct.flMaps.flMap0.NR = 1;
+		/* Disable the GbE region */
+		descriptorStruct = descriptorGbeRegionRemoved(descriptorStruct);
+		/* BIOS region fills the remaining space, after the descriptor */
+		descriptorStruct = descriptorBiosRegionFillImageAfterDescriptor(descriptorStruct, romSize);
+
+		/* No GbE region means that an onboard NIC is still used, but it's discrete (eg Broadcom) */
+		descriptorStruct.ichStraps.ichStrap0.integratedGbe = 0x0;
+		descriptorStruct.ichStraps.ichStrap0.lanPhy = 0x0;
+	}
+
+	return descriptorStruct;
+}
+
+uint8_t componentDensity(unsigned int romSizeInBytes)
+{
+	/* component density, see Component Section Record. page 848 in the datasheet */
+	switch (romSizeInBytes)
+	{
+		case ROMSIZE_512KB: return 0;
+		case ROMSIZE_1MB: return 1;
+		case ROMSIZE_2MB: return 2;
+		case ROMSIZE_4MB: return 3;
+		case ROMSIZE_8MB: return 4;
+		case ROMSIZE_16MB: return 5;
+		default: return 0x7; /* reserved value */
+	}
+}
+
+/* From a factory.rom image, create a modified descriptor region, suitable
+ * for use by the libreboot project */
+struct DESCRIPTORREGIONRECORD librebootDescriptorStructFromFactory(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize)
+{
+	/* Enable or disable the GbE region, from what's in the descriptor */
+	descriptorStruct = librebootSetGbeBiosDescriptorRegions(descriptorStruct, romSize);
+
+	/* Disable the ME/TPM and remove the ME/Platform regions: */
+	descriptorStruct = descriptorMeRegionRemoved(descriptorStruct);
+	/* Disable the ME/TPM and remove the ME/Platform regions: */
+	descriptorStruct = descriptorPlatformRegionRemoved(descriptorStruct);
+
+	/* Disable the ME itself, so that it doesn't try to start when this descriptor is in use */
+	descriptorStruct = descriptorDisableMe(descriptorStruct);
+	/* Also disable the TPM, by default */
+	descriptorStruct = descriptorDisableTpm(descriptorStruct);
+
+	return descriptorStruct;
+}
+
+/*
+ * ---------------------------------------------------------------------
+ * C code generator (self-writing code)
+ * ---------------------------------------------------------------------
+ */
+
+/*
+ * Generate a C (.h) header file for the C source file made by notCreatedCFileFromDescriptorStruct()
+ *
+ * Output it to a file.
+ */
+int notCreatedHFileForDescriptorCFile(char* outFileName, char* cFileName)
+{
+	remove(outFileName); /* Remove the old file before continuing */
+
+	/* Open the file that will be written to */
+	FILE* fp = fopen(outFileName, "w+");
+
+	/* ------------------------------ */
+
+	fprintf(fp, "/* %s: generated C code from ich9deblob */\n", outFileName);
+	fprintf(fp, "/* .h header file for the descriptor-generating C code (%s) */\n\n", cFileName);
+
+	fprintf(fp, "#ifndef ICH9GEN_MKDESCRIPTOR_H\n");
+	fprintf(fp, "#define ICH9GEN_MKDESCRIPTOR_H\n\n");
+
+	fprintf(fp, "#include <stdio.h>\n");
+	fprintf(fp, "#include <string.h>\n");
+	fprintf(fp, "#include \"../descriptor/descriptor.h\"\n\n");
+
+	fprintf(fp, "struct DESCRIPTORREGIONRECORD generatedDescriptorStruct(unsigned int romSize, int hasGbe);\n");
+
+	fprintf(fp, "#endif\n");
+
+	/* ------------------------------ */
+
+	fclose(fp); /* Always close the file when done. */
+
+	return 0;
+}
+
+/*
+ * Generate a C source file that initializes the same data from a given
+ * 4KiB Descriptor data structure.
+ *
+ * Output it to a file.
+ */
+int notCreatedCFileFromDescriptorStruct(struct DESCRIPTORREGIONRECORD descriptorStruct, char* outFileName, char* headerFileName)
+{
+	int i, j;
+
+	remove(outFileName); /* Remove the old file before continuing */
+
+	/* Open the file that will be written to */
+	FILE* fp = fopen(outFileName, "w+");
+
+	/* ------------------------------ */
+
+	fprintf(fp, "/* %s: generated C code from ich9deblob */\n", outFileName);
+	fprintf(fp, "/* .c source file for the descriptor-generating C code */\n\n");
+
+	fprintf(fp, "#include \"%s\"\n\n", headerFileName);
+
+	fprintf(fp, "/* Generate a 4KiB Descriptor struct, with default values. */\n");
+	fprintf(fp, "/* Read ../descriptor/descriptor.h for an explanation of the default values used here */\n\n");
+
+	fprintf(fp, "struct DESCRIPTORREGIONRECORD generatedDescriptorStruct(unsigned int romSize, int hasGbe)\n");
+	fprintf(fp, "{\n");
+	fprintf(fp, "    int i;\n");
+	fprintf(fp, "    struct DESCRIPTORREGIONRECORD descriptorStruct;\n");
+	fprintf(fp, "\n");
+	/* Flash Valid Signature Register */
+	fprintf(fp, "    /* Flash Valid Signature Register */\n");
+	fprintf(fp, "    descriptorStruct.flValSig.signature = 0x%08x;\n", descriptorStruct.flValSig.signature);
+	fprintf(fp, "\n");
+	/* Flash Map Registers */
+	fprintf(fp, "    /* Flash Map Registers */\n");
+	fprintf(fp, "    /* FLMAP0 */\n");
+	fprintf(fp, "    descriptorStruct.flMaps.flMap0.FCBA = 0x%02x;\n", descriptorStruct.flMaps.flMap0.FCBA);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap0.NC = 0x%01x;\n", descriptorStruct.flMaps.flMap0.NC);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap0.reserved1 = 0x%02x;\n", descriptorStruct.flMaps.flMap0.reserved1);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap0.FRBA = 0x%02x;\n", descriptorStruct.flMaps.flMap0.FRBA);
+	fprintf(fp, "    /* descriptorStruct.flMaps.flMap0.NR = 0x%01x; */ /* see ../descriptor/descriptor.c */\n", descriptorStruct.flMaps.flMap0.NR);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap0.NR = hasGbe ? 0x2 : 0x1; /* see ../descriptor/descriptor.c */\n");
+	fprintf(fp, "    descriptorStruct.flMaps.flMap0.reserved2 = 0x%02x;\n", descriptorStruct.flMaps.flMap0.reserved2);
+	fprintf(fp, "    /* FLMAP1 */\n");
+	fprintf(fp, "    descriptorStruct.flMaps.flMap1.FMBA = 0x%02x;\n", descriptorStruct.flMaps.flMap1.FMBA);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap1.NM = 0x%01x;\n", descriptorStruct.flMaps.flMap1.NM);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap1.reserved = 0x%02x;\n", descriptorStruct.flMaps.flMap1.reserved);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap1.FISBA = 0x%02x;\n", descriptorStruct.flMaps.flMap1.FISBA);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap1.ISL = 0x%02x;\n", descriptorStruct.flMaps.flMap1.ISL);
+	fprintf(fp, "    /* FLMAP2 */\n");
+	fprintf(fp, "    descriptorStruct.flMaps.flMap2.FMSBA = 0x%02x;\n", descriptorStruct.flMaps.flMap2.FMSBA);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap2.MSL = 0x%02x;\n", descriptorStruct.flMaps.flMap2.MSL);
+	fprintf(fp, "    descriptorStruct.flMaps.flMap2.reserved = 0x%04x;\n", descriptorStruct.flMaps.flMap2.reserved);
+	fprintf(fp, "\n");
+	/* Component Section Record */
+	fprintf(fp, "    /* Component Section Record */\n");
+	fprintf(fp, "    /* FLCOMP */\n");
+	fprintf(fp, "    /* descriptorStruct.componentSection.flcomp.component1Density = 0x%01x; */\n", descriptorStruct.componentSection.flcomp.component1Density);
+	fprintf(fp, "    /* descriptorStruct.componentSection.flcomp.component2Density = 0x%01x; */\n", descriptorStruct.componentSection.flcomp.component2Density);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.component1Density = componentDensity(romSize);\n");
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.component2Density = componentDensity(romSize);\n");
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.reserved1 = 0x%01x;\n", descriptorStruct.componentSection.flcomp.reserved1);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.reserved2 = 0x%02x;\n", descriptorStruct.componentSection.flcomp.reserved2);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.reserved3 = 0x%01x;\n", descriptorStruct.componentSection.flcomp.reserved3);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.readClockFrequency = 0x%01x;\n", descriptorStruct.componentSection.flcomp.readClockFrequency);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.fastReadSupport = 0x%01x;\n", descriptorStruct.componentSection.flcomp.fastReadSupport);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.fastreadClockFrequency = 0x%01x;\n", descriptorStruct.componentSection.flcomp.fastreadClockFrequency);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.writeEraseClockFrequency = 0x%01x;\n", descriptorStruct.componentSection.flcomp.writeEraseClockFrequency);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.readStatusClockFrequency = 0x%01x;\n", descriptorStruct.componentSection.flcomp.readStatusClockFrequency);
+	fprintf(fp, "    descriptorStruct.componentSection.flcomp.reserved4 = 0x%01x;\n", descriptorStruct.componentSection.flcomp.reserved4);
+	fprintf(fp, "    /* FLILL */\n");
+	fprintf(fp, "    descriptorStruct.componentSection.flill = 0x%08x;\n", descriptorStruct.componentSection.flill);
+	fprintf(fp, "    /* FLPB */\n");
+	fprintf(fp, "    descriptorStruct.componentSection.flpb = 0x%08x;\n", descriptorStruct.componentSection.flpb);
+	fprintf(fp, "    /* Padding */\n");
+	for (i = 0; i < 36; i++) {
+		if (descriptorStruct.componentSection.padding[i] != 0xFF) {
+			for (j = 0; j < 36; j++) {
+				fprintf(fp, "    descriptorStruct.componentSection.padding[%d] = 0x%02x;\n", j, descriptorStruct.componentSection.padding[j]);
+			}
+			break;
+		} else if (i == 35) {
+			fprintf(fp, "    for (i = 0; i < 36; i++) {\n");
+			fprintf(fp, "        descriptorStruct.componentSection.padding[i] = 0xFF;\n");
+			fprintf(fp, "    }\n");
+			break;
+		}
+	}
+	fprintf(fp, "\n");
+	/* Flash Descriptor Region Section */
+	fprintf(fp, "    /* Flash Descriptor Region Section */\n");
+	fprintf(fp, "    /* FLREG0 (Descriptor) */\n");
+	fprintf(fp, "    descriptorStruct.regionSection.flReg0.BASE = 0x%04x;\n", descriptorStruct.regionSection.flReg0.BASE);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg0.reserved1 = 0x%01x;\n", descriptorStruct.regionSection.flReg0.reserved1);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg0.LIMIT = 0x%04x;\n", descriptorStruct.regionSection.flReg0.LIMIT);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg0.reserved2 = 0x%01x;\n", descriptorStruct.regionSection.flReg0.reserved2);
+	fprintf(fp, "    /* FLREG1 (BIOS) */\n");
+	fprintf(fp, "    /* descriptorStruct.regionSection.flReg1.BASE = 0x%04x; */\n", descriptorStruct.regionSection.flReg1.BASE);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg1.BASE = (DESCRIPTORREGIONSIZE + (hasGbe ? GBEREGIONSIZE_8K : 0)) >> FLREGIONBITSHIFT; /* see ../descriptor/descriptor.c */\n");
+	fprintf(fp, "    descriptorStruct.regionSection.flReg1.reserved1 = 0x%01x;\n", descriptorStruct.regionSection.flReg1.reserved1);
+	fprintf(fp, "    /* descriptorStruct.regionSection.flReg1.LIMIT = 0x%04x; */\n", descriptorStruct.regionSection.flReg1.LIMIT);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg1.LIMIT = ((romSize >> FLREGIONBITSHIFT) - 1); /* see ../descriptor/descriptor.c */\n");
+	fprintf(fp, "    descriptorStruct.regionSection.flReg1.reserved2 = 0x%01x;\n", descriptorStruct.regionSection.flReg1.reserved2);
+	fprintf(fp, "    /* FLREG2 (ME) */\n");
+	fprintf(fp, "    descriptorStruct.regionSection.flReg2.BASE = 0x%04x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.regionSection.flReg2.BASE);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg2.reserved1 = 0x%01x;\n", descriptorStruct.regionSection.flReg2.reserved1);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg2.LIMIT = 0x%04x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.regionSection.flReg2.LIMIT);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg2.reserved2 = 0x%01x;\n", descriptorStruct.regionSection.flReg2.reserved2);
+	fprintf(fp, "    /* FLREG3 (Gbe) */\n");
+	fprintf(fp, "    /* descriptorStruct.regionSection.flReg3.BASE = 0x%04x; */\n", descriptorStruct.regionSection.flReg3.BASE);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg3.BASE = hasGbe ? (DESCRIPTORREGIONSIZE >> FLREGIONBITSHIFT) : 0x1fff; /* see ../descriptor/descriptor.c */\n");
+	fprintf(fp, "    descriptorStruct.regionSection.flReg3.reserved1 = 0x%01x;\n", descriptorStruct.regionSection.flReg3.reserved1);
+	fprintf(fp, "    /* descriptorStruct.regionSection.flReg3.LIMIT = 0x%04x; */\n", descriptorStruct.regionSection.flReg3.LIMIT);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg3.LIMIT = hasGbe ? (GBEREGIONSIZE_8K >> FLREGIONBITSHIFT) : 0x0000; /* see ../descriptor/descriptor.c */\n");
+	fprintf(fp, "    descriptorStruct.regionSection.flReg3.reserved2 = 0x%01x;\n", descriptorStruct.regionSection.flReg3.reserved2);
+	fprintf(fp, "    /* FLREG4 (Platform) */\n");
+	fprintf(fp, "    descriptorStruct.regionSection.flReg4.BASE = 0x%04x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.regionSection.flReg4.BASE);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg4.reserved1 = 0x%01x;\n", descriptorStruct.regionSection.flReg4.reserved1);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg4.LIMIT = 0x%04x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.regionSection.flReg4.LIMIT);
+	fprintf(fp, "    descriptorStruct.regionSection.flReg4.reserved2 = 0x%01x;\n", descriptorStruct.regionSection.flReg4.reserved2);
+	fprintf(fp, "    /* Padding */\n");
+	for (i = 0; i < 12; i++) {
+		if (descriptorStruct.regionSection.padding[i] != 0xFF) {
+			for (j = 0; j < 12; j++) {
+				fprintf(fp, "    descriptorStruct.regionSection.padding[%d] = 0x%02x;\n", j, descriptorStruct.regionSection.padding[j]);
+			}
+			break;
+		} else if (i == 11) {
+			fprintf(fp, "    for (i = 0; i < 12; i++) {\n");
+			fprintf(fp, "        descriptorStruct.regionSection.padding[i] = 0xFF;\n");
+			fprintf(fp, "    }\n");
+			break;
+		}
+	}
+	fprintf(fp, "\n");
+	/* Master Access Section */
+	fprintf(fp, "    /* Master Access Section */\n");
+	fprintf(fp, "    /* FLMSTR1 (Host CPU / BIOS) */\n");
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.requesterId = 0x%04x;\n", descriptorStruct.masterAccessSection.flMstr1.requesterId);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.fdRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.fdRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.biosRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.biosRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.meRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.meRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.gbeRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.gbeRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.pdRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.pdRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.reserved1 = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr1.reserved1);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.fdRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.fdRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.biosRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.biosRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.meRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.meRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.gbeRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.gbeRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.pdRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr1.pdRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr1.reserved2 = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr1.reserved2);
+	fprintf(fp, "    /* FLMSTR2 (ME) */\n");
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.requesterId = 0x%04x;\n", descriptorStruct.masterAccessSection.flMstr2.requesterId);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.fdRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.fdRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.biosRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.biosRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.meRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.meRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.gbeRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.gbeRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.pdRegionReadAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.pdRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.reserved1 = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr2.reserved1);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.fdRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.fdRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.biosRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.biosRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.meRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.meRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.gbeRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.gbeRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.pdRegionWriteAccess = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.masterAccessSection.flMstr2.pdRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr2.reserved2 = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr2.reserved2);
+	fprintf(fp, "    /* FLMSTR3 (Gbe) */\n");
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.requesterId = 0x%04x;\n", descriptorStruct.masterAccessSection.flMstr3.requesterId);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.fdRegionReadAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.fdRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.biosRegionReadAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.biosRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.meRegionReadAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.meRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.gbeRegionReadAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.gbeRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.pdRegionReadAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.pdRegionReadAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.reserved1 = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.reserved1);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.fdRegionWriteAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.fdRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.biosRegionWriteAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.biosRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.meRegionWriteAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.meRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.gbeRegionWriteAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.gbeRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.pdRegionWriteAccess = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.pdRegionWriteAccess);
+	fprintf(fp, "    descriptorStruct.masterAccessSection.flMstr3.reserved2 = 0x%01x;\n", descriptorStruct.masterAccessSection.flMstr3.reserved2);
+	fprintf(fp, "    /* Padding */\n");
+	for (i = 0; i < 148; i++) {
+		if (descriptorStruct.masterAccessSection.padding[i] != 0xFF) {
+			for (j = 0; j < 148; j++) {
+				fprintf(fp, "    descriptorStruct.masterAccessSection.padding[%d] = 0x%02x;\n", j, descriptorStruct.masterAccessSection.padding[j]);
+			}
+			break;
+		} else if (i == 147) {
+			fprintf(fp, "    for (i = 0; i < 148; i++) {\n");
+			fprintf(fp, "        descriptorStruct.masterAccessSection.padding[i] = 0xFF;\n");
+			fprintf(fp, "    }\n");
+			break;
+		}
+	}
+	fprintf(fp, "\n");
+	/* ICH straps */
+	fprintf(fp, "    /* ICH straps */\n");
+	fprintf(fp, "    /* ICHSTRAP0 */\n");
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.meDisable = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.ichStraps.ichStrap0.meDisable);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.reserved1 = 0x%02x;\n", descriptorStruct.ichStraps.ichStrap0.reserved1);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.tcoMode = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap0.tcoMode);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.smBusAddress = 0x%02x;\n", descriptorStruct.ichStraps.ichStrap0.smBusAddress);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.bmcMode = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap0.bmcMode);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.tripPointSelect = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap0.tripPointSelect);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.reserved2 = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap0.reserved2);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.integratedGbe = hasGbe ? 0x1 : 0x0;\n");
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.lanPhy = hasGbe ? 0x1 : 0x0;\n");
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.reserved3 = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap0.reserved3);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.dmiRequesterId = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap0.dmiRequesterId);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap0.smBus2Address = 0x%02x;\n", descriptorStruct.ichStraps.ichStrap0.smBus2Address);
+	fprintf(fp, "    /* ICHSTRAP1 */\n");
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.northMlink = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap1.northMlink);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.southMlink = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap1.southMlink);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.meSmbus = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap1.meSmbus);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.sstDynamic = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap1.sstDynamic);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.reserved1 = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap1.reserved1);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.northMlink2 = 0x%01x;\n", descriptorStruct.ichStraps.ichStrap1.northMlink2);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.reserved2 = 0x%02x;\n", descriptorStruct.ichStraps.ichStrap1.reserved2);
+	fprintf(fp, "    descriptorStruct.ichStraps.ichStrap1.reserved3 = 0x%04x;\n", descriptorStruct.ichStraps.ichStrap1.reserved3);
+	fprintf(fp, "    /* Padding */\n");
+	for (i = 0; i < 248; i++) {
+		if (descriptorStruct.ichStraps.padding[i] != 0xFF) {
+			for (j = 0; j < 248; j++) {
+				fprintf(fp, "    descriptorStruct.ichStraps.padding[%d] = 0x%02x;\n", j, descriptorStruct.ichStraps.padding[j]);
+			}
+			break;
+		} else if (i == 247) {
+			fprintf(fp, "    for (i = 0; i < 248; i++) {\n");
+			fprintf(fp, "        descriptorStruct.ichStraps.padding[i] = 0xFF;\n");
+			fprintf(fp, "    }\n");
+			break;
+		}
+	}
+	fprintf(fp, "\n");
+	/* MCH straps */
+	fprintf(fp, "    /* MCH straps */\n");
+	fprintf(fp, "    /* MCHSTRAP0 */\n");
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.meDisable = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.mchStraps.mchStrap0.meDisable);
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.meBootFromFlash = 0x%01x;\n", descriptorStruct.mchStraps.mchStrap0.meBootFromFlash);
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.tpmDisable = 0x%01x; /* see ../descriptor/descriptor.c */\n", descriptorStruct.mchStraps.mchStrap0.tpmDisable);
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.reserved1 = 0x%01x;\n", descriptorStruct.mchStraps.mchStrap0.reserved1);
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.spiFingerprint = 0x%01x;\n", descriptorStruct.mchStraps.mchStrap0.spiFingerprint);
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.meAlternateDisable = 0x%01x;\n", descriptorStruct.mchStraps.mchStrap0.meAlternateDisable);
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.reserved2 = 0x%02x;\n", descriptorStruct.mchStraps.mchStrap0.reserved2);
+	fprintf(fp, "    descriptorStruct.mchStraps.mchStrap0.reserved3 = 0x%04x;\n", descriptorStruct.mchStraps.mchStrap0.reserved3);
+	fprintf(fp, "    /* Padding */\n");
+	for (i = 0; i < 3292; i++) {
+		if (descriptorStruct.mchStraps.padding[i] != 0xFF) {
+			for (j = 0; j < 3292; j++) {
+				fprintf(fp, "    descriptorStruct.mchStraps.padding[%d] = 0x%02x;\n", j, descriptorStruct.mchStraps.padding[j]);
+			}
+			break;
+		} else if (i == 3291) {
+			fprintf(fp, "    for (i = 0; i < 3292; i++) {\n");
+			fprintf(fp, "        descriptorStruct.mchStraps.padding[i] = 0xFF;\n");
+			fprintf(fp, "    }\n");
+			break;
+		}
+	}
+	fprintf(fp, "\n");
+	/* ME VSCC Table */
+	fprintf(fp, "    /* ME VSCC Table */\n");
+	fprintf(fp, "    descriptorStruct.meVsccTable.jid0 = 0x%08x;\n", descriptorStruct.meVsccTable.jid0);
+	fprintf(fp, "    descriptorStruct.meVsccTable.vscc0 = 0x%08x;\n", descriptorStruct.meVsccTable.vscc0);
+	fprintf(fp, "    descriptorStruct.meVsccTable.jid1 = 0x%08x;\n", descriptorStruct.meVsccTable.jid1);
+	fprintf(fp, "    descriptorStruct.meVsccTable.vscc1 = 0x%08x;\n", descriptorStruct.meVsccTable.vscc1);
+	fprintf(fp, "    descriptorStruct.meVsccTable.jid2 = 0x%08x;\n", descriptorStruct.meVsccTable.jid2);
+	fprintf(fp, "    descriptorStruct.meVsccTable.vscc2 = 0x%08x;\n", descriptorStruct.meVsccTable.vscc2);
+	fprintf(fp, "    /* Padding */\n");
+	for (i = 0; i < 4; i++) {
+		if (descriptorStruct.meVsccTable.padding[i] != 0xFF) {
+			for (j = 0; j < 4; j++) {
+				fprintf(fp, "    descriptorStruct.meVsccTable.padding[%d] = 0x%02x;\n", j, descriptorStruct.meVsccTable.padding[j]);
+			}
+			break;
+		} else if (i == 3) {
+			fprintf(fp, "    for (i = 0; i < 4; i++) {\n");
+			fprintf(fp, "        descriptorStruct.meVsccTable.padding[i] = 0xFF;\n");
+			fprintf(fp, "    }\n");
+			break;
+		}
+	}
+	fprintf(fp, "\n");
+	/* Descriptor Map 2 Record */
+	fprintf(fp, "    /* Descriptor Map 2 Record */\n");
+	fprintf(fp, "    descriptorStruct.descriptor2Map.meVsccTableBaseAddress = 0x%02x;\n", descriptorStruct.descriptor2Map.meVsccTableBaseAddress);
+	fprintf(fp, "    descriptorStruct.descriptor2Map.meVsccTableLength = 0x%02x;\n", descriptorStruct.descriptor2Map.meVsccTableLength);
+	fprintf(fp, "    descriptorStruct.descriptor2Map.reserved = 0x%04x;\n", descriptorStruct.descriptor2Map.reserved);
+	fprintf(fp, "\n");
+	/* OEM section */
+	fprintf(fp, "    /* OEM section */\n");
+	fprintf(fp, "    /* see ../descriptor/descriptor.c */\n");
+	fprintf(fp, "    /* Magic String (ascii characters) */\n");
+	for(i = 0; i < 8; i++) {
+		fprintf(fp, "    descriptorStruct.oemSection.magicString[%d] = 0x%02x;\n", i, descriptorStruct.oemSection.magicString[i]);
+	}
+	fprintf(fp, "    /* Padding */\n");
+	for (i = 0; i < 248; i++) {
+		if (descriptorStruct.oemSection.padding[i] != 0xFF) {
+			for (j = 0; j < 248; j++) {
+				fprintf(fp, "    descriptorStruct.oemSection.padding[%d] = 0x%02x;\n", j, descriptorStruct.oemSection.padding[j]);
+			}
+			break;
+		} else if (i == 247) {
+			fprintf(fp, "    for (i = 0; i < 248; i++) {\n");
+			fprintf(fp, "        descriptorStruct.oemSection.padding[i] = 0xFF;\n");
+			fprintf(fp, "    }\n");
+			break;
+		}
+	}
+	fprintf(fp, "\n");
+	fprintf(fp, "    return descriptorStruct;\n");
+	fprintf(fp, "}\n\n");
+
+	/* ------------------------------ */
+
+	fclose(fp); /* Always close the file when done. */
+
+	return 0;
+}
+
+/*
+ * ---------------------------------------------------------------------
+ * Debugging functions:
+ * ---------------------------------------------------------------------
+ */
+
+/*
+ * show debugging info: descriptor region boundaries, in a 4KB struct.
+ */
+void printDescriptorRegionLocations(struct DESCRIPTORREGIONRECORD descriptorStruct, char* romName)
+{
+	printf("\n");
+
+	/* Descriptor region */
+	printf(
+		"%s: Descriptor start block: %08x ; Descriptor end block: %08x\n",
+		romName,
+		descriptorStruct.regionSection.flReg0.BASE << FLREGIONBITSHIFT,
+		descriptorStruct.regionSection.flReg0.LIMIT << FLREGIONBITSHIFT
+	);
+
+	/* BIOS region */
+	printf(
+		"%s: BIOS start block: %08x ; BIOS end block: %08x\n",
+		romName,
+		descriptorStruct.regionSection.flReg1.BASE << FLREGIONBITSHIFT,
+		descriptorStruct.regionSection.flReg1.LIMIT << FLREGIONBITSHIFT
+	);
+
+	/* ME region */
+	printf(
+		"%s: ME start block: %08x ; ME end block: %08x\n",
+		romName,
+		descriptorStruct.regionSection.flReg2.BASE << FLREGIONBITSHIFT,
+		descriptorStruct.regionSection.flReg2.LIMIT << FLREGIONBITSHIFT
+	);
+
+	/* GBe region */
+	printf(
+		"%s: GBe start block: %08x ; GBe end block: %08x\n",
+		romName,
+		descriptorStruct.regionSection.flReg3.BASE << FLREGIONBITSHIFT,
+		descriptorStruct.regionSection.flReg3.LIMIT << FLREGIONBITSHIFT
+	);
+
+	/* Platform region */
+	printf(
+		"%s: Platform start block: %08x ; Platform end block: %08x\n",
+		romName,
+		descriptorStruct.regionSection.flReg4.BASE << FLREGIONBITSHIFT,
+		descriptorStruct.regionSection.flReg4.LIMIT << FLREGIONBITSHIFT
+	);
+
+	return;
+}
diff --git a/projects/ich9gen/sources/src/descriptor/descriptor.h b/projects/ich9gen/sources/src/descriptor/descriptor.h
new file mode 100644
index 00000000..c81d451f
--- /dev/null
+++ b/projects/ich9gen/sources/src/descriptor/descriptor.h
@@ -0,0 +1,333 @@
+/*
+ *  descriptor/descriptor.h
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ *  Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *
+ *  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/>.
+ */
+
+/*
+ * Purpose: provide struct representing descriptor region.
+ * Map actual buffers of this regions, directly to instances of these
+ * structs. This makes working with descriptor really easy.
+ *
+ * bit fields used, corresponding to datasheet. See links to datasheets
+ * and documentation in ich9deblob.c
+ */
+
+/*
+ * See docs/hardware/x200_remove_me.html for info plus links to datasheet (also linked below)
+ *
+ * Info about flash descriptor (read page 845 onwards):
+ * http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf
+ */
+
+#ifndef DESCRIPTORSTRUCT_H
+#define DESCRIPTORSTRUCT_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include "../gbe/gbe.h" /* Needed for GBEREGIONSIZE_4K/8K define */
+
+/* size of the descriptor in bytes */
+#define DESCRIPTORREGIONSIZE 0x1000
+
+/* ROM image sizes in bytes */
+#define ROMSIZE_512KB 0x80000
+#define ROMSIZE_1MB 0x100000
+#define ROMSIZE_2MB 0x200000
+#define ROMSIZE_4MB 0x400000
+#define ROMSIZE_8MB 0x800000
+#define ROMSIZE_16MB 0x1000000
+
+/*
+ * Related to the flash descriptor
+ * bits 12(0xC)-24(0x18) are represented for words found in the flash descriptor
+ * To manipulate these easily in C, we shift them by FLREGIONBITSHIFT and then shift them back when done
+ * (because this is how data is stored in the flash descriptor)
+ */
+#define FLREGIONBITSHIFT 0xC
+
+/*
+ * ---------------------------------------------------------------------
+ * Descriptor struct representing the data
+ * ---------------------------------------------------------------------
+ */
+
+/* Flash Valid Signature Register */
+struct FLVALSIG
+{
+	/*
+	 * 4 bytes.
+	 * descriptor mode = 0FF0A55A (hex, big endian). Note: stored in ROM in little endian order.
+	 * Anything else is considered invalid and will put the system in non-descriptor mode.
+	 */
+	uint32_t signature; /* Put 0x0FF0A55A here. confirmed in deblobbed_descriptor.bin */
+};
+
+/*  */
+struct FLMAP0
+{
+	/* least signicant bits */
+	uint8_t FCBA                      : 8;
+	uint8_t NC                        : 2;
+	uint8_t reserved1                 : 6;
+	uint8_t FRBA                      : 8;
+	uint8_t NR                        : 3;
+	uint8_t reserved2                 : 5;
+	/* most significant bits. */
+};
+
+struct FLMAP1
+{
+	/* least significant bits */
+	uint8_t FMBA                      : 8;
+	uint8_t NM                        : 3;
+	uint8_t reserved                  : 5;
+	uint8_t FISBA                     : 8;
+	uint8_t ISL                       : 8;
+	/* most significant bits */
+};
+
+struct FLMAP2
+{
+	/* least significant bits */
+	uint8_t FMSBA                     : 8;
+	uint8_t MSL                       : 8;
+	uint16_t reserved                 : 16;
+	/* most significant bits */
+};
+
+/* Flash Map Registers */
+struct FLMAPS
+{
+	struct FLMAP0 flMap0;
+	struct FLMAP1 flMap1;
+	struct FLMAP2 flMap2;
+};
+
+/* Flash Components Register */
+struct FLCOMP
+{
+	/* least significant bits */
+	uint8_t component1Density         : 3;
+	uint8_t component2Density         : 3;
+	uint8_t reserved1                 : 2;
+	uint8_t reserved2                 : 8;
+	uint8_t reserved3                 : 1;
+	uint8_t readClockFrequency        : 3;
+	uint8_t fastReadSupport           : 1;
+	uint8_t fastreadClockFrequency    : 3;
+	uint8_t writeEraseClockFrequency  : 3;
+	uint8_t readStatusClockFrequency  : 3;
+	uint8_t reserved4                 : 2;
+	/* most significant bits */
+};
+
+struct COMPONENTSECTIONRECORD
+{
+	struct FLCOMP flcomp;
+	uint32_t flill;
+	uint32_t flpb;
+	uint8_t padding[36];
+};
+
+struct FLREG
+{
+	/* least significant bits */
+	uint16_t BASE                     : 13;
+	uint16_t reserved1                : 3;
+	uint16_t LIMIT                    : 13;
+	uint16_t reserved2                : 3;
+	/* most significant bits */
+};
+
+/* Flash Descriptor Region Section */
+/*
+ * Defines where all the regions begin/end.
+ * This is very important for disabling ME/AMT
+ */
+struct REGIONSECTIONRECORD
+{
+	struct FLREG flReg0;                         /*  Descriptor */
+	struct FLREG flReg1;                         /*  BIOS       */
+	struct FLREG flReg2;                         /*  ME         */
+	struct FLREG flReg3;                         /*  Gbe        */
+	struct FLREG flReg4;                         /*  Platform   */
+	uint8_t padding[12];
+};
+
+struct FLMSTR
+{
+	/* least significant bits */
+   uint16_t requesterId              : 16;
+	uint8_t fdRegionReadAccess        : 1;
+	uint8_t biosRegionReadAccess      : 1;
+	uint8_t meRegionReadAccess        : 1;
+	uint8_t gbeRegionReadAccess       : 1;
+	uint8_t pdRegionReadAccess        : 1;
+	uint8_t reserved1                 : 3; /* Must be zero, according to datasheet */
+	uint8_t fdRegionWriteAccess       : 1;
+	uint8_t biosRegionWriteAccess     : 1;
+	uint8_t meRegionWriteAccess       : 1;
+	uint8_t gbeRegionWriteAccess      : 1;
+	uint8_t pdRegionWriteAccess       : 1;
+	uint8_t reserved2                 : 3; /* Must be zero, according to datasheet */
+	/* most significant bits */
+};
+
+/* Master Access Section */
+struct MASTERACCESSSECTIONRECORD
+{
+	struct FLMSTR flMstr1;                       /* Flash Master 1 (Host CPU / BIOS) */
+	struct FLMSTR flMstr2;                       /* Flash Master 2 (ME) */
+	struct FLMSTR flMstr3;                       /* Flash Master 3 (Gbe) */
+	uint8_t padding[148];
+};
+
+struct ICHSTRAP0
+{
+	/* least significant bits */
+	                                             /* todo: add MeSmBus2Sel (boring setting) */
+	uint8_t meDisable                 : 1; /* If true, ME is disabled. */
+	uint8_t reserved1                 : 6;
+	uint8_t tcoMode                   : 1; /* TCO Mode: (Legacy,TCO Mode) The TCO Mode, along with the BMCMODE strap, determines the behavior of the IAMT SmBus controller. */
+	uint8_t smBusAddress              : 7; /* The ME SmBus 7-bit address. */
+	uint8_t bmcMode                   : 1; /* BMC mode: If true, device is in BMC mode.  If Intel(R) AMT or ASF using Intel integrated LAN then this should be false. */
+	uint8_t tripPointSelect           : 1; /* Trip Point Select: false the NJCLK input buffer is matched to 3.3v signal from the external PHY device, true is matched to 1.8v. */
+	uint8_t reserved2                 : 2;
+	uint8_t integratedGbe             : 1; /* Integrated GbE or PCI Express select: (PCI Express,,Integrated GbE) Defines what PCIe Port 6 is used for. */
+	uint8_t lanPhy                    : 1; /* LANPHYPC_GP12_SEL: Set to 0 for GP12 to be used as GPIO (General Purpose Input/Output), or 1 for GP12 to be used for native mode as LAN_PHYPC for 82566 LCD device */
+	uint8_t reserved3                 : 3;
+	uint8_t dmiRequesterId            : 1; /* DMI requestor ID security check disable: The primary purpose of this strap is to support server environments with multiple CPUs that each have a different RequesterID that can access the Flash. */
+	uint8_t smBus2Address             : 7; /* The ME SmBus 2 7-bit address. */
+	/* most significant bits */
+};
+
+struct ICHSTRAP1
+{
+	/* least significant bits */
+	uint8_t northMlink                : 1;  /* North MLink Dynamic Clock Gate Disable : Sets the default value for the South MLink Dynamic Clock Gate Enable registers. */
+	uint8_t southMlink                : 1;  /* South MLink Dynamic Clock Gate Enable : Sets the default value for the South MLink Dynamic Clock Gate Enable registers. */
+	uint8_t meSmbus                   : 1;  /* ME SmBus Dynamic Clock Gate Enable : Sets the default value for the ME SMBus Dynamic Clock Gate Enable for both the ME SmBus controllers. */
+	uint8_t sstDynamic                : 1;  /* SST Dynamic Clock Gate Enable : Sets the default value for the SST Clock Gate Enable registers. */
+	uint8_t reserved1                 : 4;
+	uint8_t northMlink2               : 1;  /* North MLink 2 Non-Posted Enable : 'true':North MLink supports two downstream non-posted requests. 'false':North MLink supports one downstream non-posted requests. */
+	uint8_t reserved2                 : 7;
+	uint16_t reserved3                : 16;
+	/* most significant bits */
+};
+
+/* ICH straps */
+struct ICHSTRAPSRECORD
+{
+	struct ICHSTRAP0 ichStrap0;
+	struct ICHSTRAP1 ichStrap1;
+	uint8_t padding[248];
+};
+
+struct MCHSTRAP0
+{
+	/* least significant bits */
+	uint8_t meDisable                 : 1;  /* If true, ME is disabled. */
+	uint8_t meBootFromFlash           : 1;  /* ME boot from Flash - guessed location */
+	uint8_t tpmDisable                : 1;  /* iTPM Disable : When set true, iTPM Host Interface is disabled. When set false (default), iTPM is enabled. */
+	uint8_t reserved1                 : 3;
+	uint8_t spiFingerprint            : 1;  /* SPI Fingerprint Sensor Present: Indicates if an SPI Fingerprint sensor is present at CS#1. */
+	uint8_t meAlternateDisable        : 1;  /* ME Alternate Disable: Setting this bit allows ME to perform critical chipset functions but prevents loading of any ME FW applications. */
+	uint8_t reserved2                 : 8;
+	uint16_t reserved3                : 16;
+	/* most significant bits */
+};
+
+/* MCH straps */
+struct MCHSTRAPSRECORD
+{
+	struct MCHSTRAP0 mchStrap0;
+	uint8_t padding[3292];
+};
+
+/* ME VSCC Table */
+struct MEVSCCTABLERECORD
+{
+	uint32_t jid0;
+	uint32_t vscc0;
+	uint32_t jid1;
+	uint32_t vscc1;
+	uint32_t jid2;
+	uint32_t vscc2;
+	uint8_t padding[4];
+};
+
+/* Descriptor Map 2 Record */
+struct DESCRIPTORMAP2RECORD
+{
+	/* least significant bits */
+	uint8_t meVsccTableBaseAddress    : 8;
+	uint8_t meVsccTableLength         : 8;
+	uint16_t reserved                 : 16;
+	/* most significant bits */
+};
+
+/* OEM section */
+struct OEMSECTIONRECORD
+{
+	uint8_t magicString[8];
+	uint8_t padding[248];
+};
+
+/* 4KiB descriptor region, goes at the beginning of the ROM image */
+struct DESCRIPTORREGIONRECORD
+{
+	struct FLVALSIG flValSig;                                   /* Flash Valid Signature Register */
+	struct FLMAPS flMaps;                                       /* Flash Map Registers */
+	struct COMPONENTSECTIONRECORD componentSection;             /* Component Section Record */
+	struct REGIONSECTIONRECORD regionSection;                   /* Flash Descriptor Region Section */
+	struct MASTERACCESSSECTIONRECORD masterAccessSection;       /* Master Access Section */
+	struct ICHSTRAPSRECORD ichStraps;                           /* ICH straps */
+	struct MCHSTRAPSRECORD mchStraps;                           /* MCH straps */
+	struct MEVSCCTABLERECORD meVsccTable;                       /* ME VSCC Table */
+	struct DESCRIPTORMAP2RECORD descriptor2Map;                 /* Descriptor Map 2 Record */
+	struct OEMSECTIONRECORD oemSection;                         /* OEM section */
+};
+
+/*
+ * ---------------------------------------------------------------------
+ * Function declarations (keep gcc/make happy. check them in descriptor.c)
+ * ---------------------------------------------------------------------
+ */
+
+struct DESCRIPTORREGIONRECORD descriptorHostRegionsUnlocked(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorMeRegionsForbidden(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorMeRegionRemoved(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorPlatformRegionRemoved(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorDisableMe(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorDisableTpm(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorMoveGbeToStart(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorGbeRegionRemoved(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD descriptorBiosRegionFillImageAfterGbe(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize);
+struct DESCRIPTORREGIONRECORD descriptorBiosRegionFillImageAfterDescriptor(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize);
+struct DESCRIPTORREGIONRECORD descriptorOemString(struct DESCRIPTORREGIONRECORD descriptorStruct);
+int descriptorDefinesGbeRegion(struct DESCRIPTORREGIONRECORD descriptorStruct);
+struct DESCRIPTORREGIONRECORD librebootSetGbeBiosDescriptorRegions(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize);
+uint8_t componentDensity(unsigned int romSizeInBytes);
+struct DESCRIPTORREGIONRECORD librebootDescriptorStructFromFactory(struct DESCRIPTORREGIONRECORD descriptorStruct, unsigned int romSize);
+int notCreatedHFileForDescriptorCFile(char* outFileName, char* cFileName);
+int notCreatedCFileFromDescriptorStruct(struct DESCRIPTORREGIONRECORD descriptorStruct, char* outFileName, char* headerFileName);
+void printDescriptorRegionLocations(struct DESCRIPTORREGIONRECORD descriptorStruct, char* romName);
+
+#endif
diff --git a/projects/ich9gen/sources/src/gbe/gbe.c b/projects/ich9gen/sources/src/gbe/gbe.c
new file mode 100644
index 00000000..6bd41549
--- /dev/null
+++ b/projects/ich9gen/sources/src/gbe/gbe.c
@@ -0,0 +1,454 @@
+/*
+ *  gbe/gbe.c
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *                     Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+/*
+ * Provide gbe related functions.
+ */
+
+/* structs describing the data from gbe region */
+#include "gbe.h"
+
+/*
+ * ---------------------------------------------------------------------
+ * Gbe functions:
+ * ---------------------------------------------------------------------
+ */
+
+/* gbe checksum calculation (algorithm based on datasheet) */
+uint16_t gbeGetChecksumFrom4kBuffer(uint16_t* gbeWord, uint16_t desiredValue, int gbeRegionBase)
+{
+	int wordOffset;
+	uint16_t total = 0;
+
+	for (wordOffset = 0; wordOffset < 0x3F; wordOffset++)
+		total += gbeWord[wordOffset + (gbeRegionBase>>1)];
+
+	return desiredValue - total;
+}
+
+/* checksum calculation for 4k gbe struct (algorithm based on datasheet) */
+uint16_t gbeGetChecksumFrom4kStruct(struct GBEREGIONRECORD_4K gbeStruct4k, uint16_t desiredValue)
+{
+	return gbeGetChecksumFrom4kBuffer((uint16_t*)&gbeStruct4k, desiredValue, 0);
+}
+
+/* modify the gbe region extracted from a factory.rom dump */
+struct GBEREGIONRECORD_8K deblobbedGbeStructFromFactory(struct GBEREGIONRECORD_8K gbeStruct8k)
+{
+	unsigned int i;
+
+	/*
+	 * http://www.intel.co.uk/content/dam/doc/application-note/82573-nvm-map-appl-note.pdf
+	 * That is a datasheet for a later chipset. Word 40H-53H seems (as per this datasheet) to be for AMT.
+	 * Writing over it doesn't seem to cause any harm, since the ME/AMT is already removed in libreboot.
+	 */
+	for(i = 0; i < sizeof(gbeStruct8k.backup.padding); i++) {
+		gbeStruct8k.backup.padding[i] = 0xFF; /* FF is correct. In the struct, this is a char buffer. */
+	} /* We really only need to do this for words 40h-53h, but let's just nuke the whole lot. It's all 0xFF anyway. */
+
+	/* Fix the checksum */
+	gbeStruct8k.backup.checkSum = gbeGetChecksumFrom4kStruct(gbeStruct8k.backup, GBECHECKSUMTOTAL);
+
+	/* Main Gbe region on X200 (as shipped by Lenovo) is broken. Fix it by over-writing it with the contents of the backup */
+	memcpy(&gbeStruct8k.main, &gbeStruct8k.backup, GBEREGIONSIZE_4K);
+
+	return gbeStruct8k;
+}
+
+/*
+ * ---------------------------------------------------------------------
+ * C code generator (self-writing code)
+ * ---------------------------------------------------------------------
+ */
+
+/*
+ * Generate a C (.h) header file for the C source file made by notCreatedCFileFromGbeStruct4k()
+ *
+ * Output it to a file.
+ */
+int notCreatedHFileForGbeCFile(char* outFileName, char* cFileName)
+{
+	remove(outFileName); /* Remove the old file before continuing */
+
+	/* Open the file that will be written to */
+	FILE* fp = fopen(outFileName, "w+");
+
+	/* ------------------------------ */
+
+	fprintf(fp, "/* %s: generated C code from ich9deblob */\n", outFileName);
+	fprintf(fp, "/* .h header file for the gbe-generating C code (%s) */\n\n", cFileName);
+
+	fprintf(fp, "#ifndef ICH9GEN_MKGBE_H\n");
+	fprintf(fp, "#define ICH9GEN_MKGBE_H\n\n");
+
+	fprintf(fp, "#include <stdio.h>\n");
+	fprintf(fp, "#include <string.h>\n");
+	fprintf(fp, "#include \"../gbe/gbe.h\"\n\n");
+
+	fprintf(fp, "struct GBEREGIONRECORD_4K generatedGbeStruct4k();\n");
+	fprintf(fp, "struct GBEREGIONRECORD_8K generatedGbeStruct8k();\n\n");
+
+	fprintf(fp, "#endif\n");
+
+	/* ------------------------------ */
+
+	fclose(fp); /* Always close the file when done. */
+
+	return 0;
+}
+/*
+ * Generate a C source file that initializes the same data from a given
+ * 4KiB Gbe data structure.
+ *
+ * It will simply copy the 4KiB struct at the end to make a full 8KiB struct.
+ * So just pass a working 4KiB Gbe struct here and you're good to go.
+ *
+ * Output it to a file.
+ */
+int notCreatedCFileFromGbeStruct4k(struct GBEREGIONRECORD_4K gbeStruct4k, char* outFileName, char* headerFileName)
+{
+	int i;
+	int paddingSize;
+	int paddingIdentical;
+
+	remove(outFileName); /* Remove the old file before continuing */
+
+	/* Open the file that will be written to */
+	FILE* fp = fopen(outFileName, "w+");
+
+	/* ------------------------------ */
+
+	fprintf(fp, "/* %s: generated C code from ich9deblob */\n", outFileName);
+	fprintf(fp, "/* .c source file for the gbe-generating C code */\n\n");
+
+	fprintf(fp, "#include \"%s\"\n\n", headerFileName);
+
+	fprintf(fp, "/* Generate a 4KiB Gbe struct, with default values. */\n");
+	fprintf(fp, "/* Read ../gbe/gbe.h for an explanation of the default values used here */\n\n");
+
+	fprintf(fp, "struct GBEREGIONRECORD_4K generatedGbeStruct4k()\n");
+	fprintf(fp, "{\n");
+	fprintf(fp, "    int i;\n");
+	fprintf(fp, "    struct GBEREGIONRECORD_4K gbeStruct4k;\n");
+	fprintf(fp, "\n");
+	/* Words 00h to 02h: MAC Address */
+	fprintf(fp, "    /* MAC address (words 00h to 02h) */\n");
+	fprintf(fp, "    /* see ../gbe/gbe.c */\n");
+	for (i = 0; i < 6; i++) {
+		fprintf(fp, "    gbeStruct4k.macAddress[%d] = 0x%02x;\n", i, gbeStruct4k.macAddress[i]);
+	}
+	fprintf(fp, "\n");
+	/* Word 03h (Reserved) */
+	fprintf(fp, "    /* Word 03h (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord03h.reserved1_0 = 0x%02x;\n", gbeStruct4k.reservedWord03h.reserved1_0);
+	fprintf(fp, "    gbeStruct4k.reservedWord03h.reserved1_1 = 0x%01x;\n", gbeStruct4k.reservedWord03h.reserved1_1);
+	fprintf(fp, "    gbeStruct4k.reservedWord03h.ibaLom = 0x%01x;\n", gbeStruct4k.reservedWord03h.ibaLom);
+	fprintf(fp, "    gbeStruct4k.reservedWord03h.reserved2 = 0x%01x;\n", gbeStruct4k.reservedWord03h.reserved2);
+	fprintf(fp, "\n");
+	/* Word 04h (Reserved) */
+	fprintf(fp, "    /* Word 04h (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord04h = 0x%04x;\n", gbeStruct4k.reservedWord04h);
+	fprintf(fp, "\n");
+	/* Word 05h (Image Version Information) */
+	fprintf(fp, "    /* Word 05h (Image Version Information) */\n");
+	fprintf(fp, "    gbeStruct4k.imageVersionInformation = 0x%04x;\n", gbeStruct4k.imageVersionInformation);
+	fprintf(fp, "\n");
+	/* Words 06h and 07h (Reserved) */
+	fprintf(fp, "    /* Words 06h and 07h (Reserved) */\n");
+	for (i = 0; i < 2; i++) {
+		fprintf(fp, "    gbeStruct4k.reservedWords06h07h[%d] = 0x%04x;\n", i, gbeStruct4k.reservedWords06h07h[i]);
+	}
+	fprintf(fp, "\n");
+	/* Words 08h and 09h (PBA Low and PBA High) */
+	fprintf(fp, "    /* Word 08h and 09h (PBA Low and PBA High) */\n");
+	fprintf(fp, "    gbeStruct4k.pbaLow = 0x%04x;\n", gbeStruct4k.pbaLow);
+	fprintf(fp, "    gbeStruct4k.pbaHigh = 0x%04x;\n", gbeStruct4k.pbaHigh);
+	fprintf(fp, "\n");
+	/* Word 0Ah (PCI Initialization Control Word) */
+	fprintf(fp, "    /* Word 0Ah (PCI Initialization Control Word) */\n");
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.loadVendorDeviceId = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.loadVendorDeviceId);
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.loadSubsystemId = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.loadSubsystemId);
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.reserved1 = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.reserved1);
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.reserved2 = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.reserved2);
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.pmEnable = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.pmEnable);
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.auxPwr = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.auxPwr);
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.reserved3 = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.reserved3);
+	fprintf(fp, "    gbeStruct4k.pciInitializationControlWord.reserved4 = 0x%01x;\n", gbeStruct4k.pciInitializationControlWord.reserved4);
+	fprintf(fp, "\n");
+	/* Word 0Bh (Subsystem ID) */
+	fprintf(fp, "    /* Word 0Bh (Subsystem ID) */\n");
+	fprintf(fp, "    gbeStruct4k.subsystemId = 0x%04x;\n", gbeStruct4k.subsystemId);
+	fprintf(fp, "\n");
+	/* Word 0Ch (Subsystem Vendor ID) */
+	fprintf(fp, "    /* Word 0Ch (Subsystem Vendor ID) */\n");
+	fprintf(fp, "    gbeStruct4k.subsystemVendorId = 0x%04x;\n", gbeStruct4k.subsystemVendorId);
+	fprintf(fp, "\n");
+	/* Word 0Dh (Device ID) */
+	fprintf(fp, "    /* Word 0Dh (Device ID) */\n");
+	fprintf(fp, "    gbeStruct4k.deviceId = 0x%04x;\n", gbeStruct4k.deviceId);
+	fprintf(fp, "\n");
+	/* Word 0Eh (Vendor ID) */
+	fprintf(fp, "    /* Word 0Eh (Vendor ID) */\n");
+	fprintf(fp, "    gbeStruct4k.vendorId = 0x%04x;\n", gbeStruct4k.vendorId);
+	fprintf(fp, "\n");
+	/* Word 0Fh (Device Revision ID) */
+	fprintf(fp, "    /* Word 0Fh (Device Revision ID) */\n");
+	fprintf(fp, "    gbeStruct4k.deviceRevId = 0x%04x;\n", gbeStruct4k.deviceRevId);
+	fprintf(fp, "\n");
+	/* Word 10h (LAN Power Consumption) */
+	fprintf(fp, "    /* Word 10h (LAN Power Consumption) */\n");
+	fprintf(fp, "    gbeStruct4k.lanPowerConsumption.lanD3Power = 0x%02x;\n", gbeStruct4k.lanPowerConsumption.lanD3Power);
+	fprintf(fp, "    gbeStruct4k.lanPowerConsumption.reserved = 0x%01x;\n", gbeStruct4k.lanPowerConsumption.reserved);
+	fprintf(fp, "    gbeStruct4k.lanPowerConsumption.lanD0Power = 0x%02x;\n", gbeStruct4k.lanPowerConsumption.lanD0Power);
+	fprintf(fp, "\n");
+	/* Words 11h and 12h (Reserved) */
+	fprintf(fp, "    /* Words 11h and 12h (Reserved) */\n");
+	for (i = 0; i < 2; i++) {
+		fprintf(fp, "    gbeStruct4k.reservedWords11h12h[%d] = 0x%04x;\n", i, gbeStruct4k.reservedWords11h12h[i]);
+	}
+	fprintf(fp, "\n");
+	/* Word 13h (Shared Initialization Control Word) */
+	fprintf(fp, "    /* Word 13h (Shared Initialization Control Word) */\n");
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.reserved1 = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.reserved1);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.forceDuplex = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.forceDuplex);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.forceSpeedEnable = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.forceSpeedEnable);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.reserved2_0 = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.reserved2_0);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.reserved2_1 = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.reserved2_1);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.phyPowerDownEnable = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.phyPowerDownEnable);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.reserved3 = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.reserved3);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.reserved4 = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.reserved4);
+	fprintf(fp, "    gbeStruct4k.sharedInitializationControlWord.sign = 0x%01x;\n", gbeStruct4k.sharedInitializationControlWord.sign);
+	fprintf(fp, "\n");
+	/* Word 14h (Extended Configuration Control Word 1) */
+	fprintf(fp, "    /* Word 14h (Extended Configuration Control Word 1) */\n");
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord1.extendedConfigurationPointer = 0x%03x;\n", gbeStruct4k.extendedConfigurationControlWord1.extendedConfigurationPointer);
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord1.oemWriteEnable = 0x%01x;\n", gbeStruct4k.extendedConfigurationControlWord1.oemWriteEnable);
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord1.reserved1 = 0x%01x;\n", gbeStruct4k.extendedConfigurationControlWord1.reserved1);
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord1.reserved2 = 0x%01x;\n", gbeStruct4k.extendedConfigurationControlWord1.reserved2);
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord1.reserved3 = 0x%01x;\n", gbeStruct4k.extendedConfigurationControlWord1.reserved3);
+	fprintf(fp, "\n");
+	/* Word 15h (Extended Configuration Control Word 2) */
+	fprintf(fp, "    /* Word 15h (Extended Configuration Control Word 2) */\n");
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord2.reserved = 0x%02x;\n", gbeStruct4k.extendedConfigurationControlWord2.reserved);
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord2.extendedPhyLength = 0x%02x;\n", gbeStruct4k.extendedConfigurationControlWord2.extendedPhyLength);
+	fprintf(fp, "\n");
+	/* Word 16h (Extended Configuration Control Word 3) */
+	fprintf(fp, "    /* Word 16h (Extended Configuration Control Word 3) */\n");
+	fprintf(fp, "    gbeStruct4k.extendedConfigurationControlWord3 = 0x%04x;\n", gbeStruct4k.extendedConfigurationControlWord3);
+	fprintf(fp, "\n");
+	/* Word 17h (LED 1 Configuration and Power Management) */
+	fprintf(fp, "    /* Word 17h (LED 1 Configuration and Power Management) */\n");
+	fprintf(fp, "    gbeStruct4k.ledCtl1.led1Mode = 0x%01x;\n", gbeStruct4k.ledCtl1.led1Mode);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.reserved1 = 0x%01x;\n", gbeStruct4k.ledCtl1.reserved1);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.led1BlinkMode = 0x%01x;\n", gbeStruct4k.ledCtl1.led1BlinkMode);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.led1Invert = 0x%01x;\n", gbeStruct4k.ledCtl1.led1Invert);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.led1Blink = 0x%01x;\n", gbeStruct4k.ledCtl1.led1Blink);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.reserved2 = 0x%01x;\n", gbeStruct4k.ledCtl1.reserved2);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.lpluEnable = 0x%01x;\n", gbeStruct4k.ledCtl1.lpluEnable);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.lpluEnableNonD0a = 0x%01x;\n", gbeStruct4k.ledCtl1.lpluEnableNonD0a);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.gbeDisableNonD0a = 0x%01x;\n", gbeStruct4k.ledCtl1.gbeDisableNonD0a);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.reserved3 = 0x%01x;\n", gbeStruct4k.ledCtl1.reserved3);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.gbeDisable = 0x%01x;\n", gbeStruct4k.ledCtl1.gbeDisable);
+	fprintf(fp, "    gbeStruct4k.ledCtl1.reserved4 = 0x%01x;\n", gbeStruct4k.ledCtl1.reserved4);
+	fprintf(fp, "\n");
+	/* Word 18h (LED 0 and 2 Configuration Defaults) */
+	fprintf(fp, "    /* Word 18h (LED 0 and 2 Configuration Defaults) */\n");
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led0Mode = 0x%01x;\n", gbeStruct4k.ledCtl02.led0Mode);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.reserved1 = 0x%01x;\n", gbeStruct4k.ledCtl02.reserved1);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led0BlinkMode = 0x%01x;\n", gbeStruct4k.ledCtl02.led0BlinkMode);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led0Invert = 0x%01x;\n", gbeStruct4k.ledCtl02.led0Invert);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led0Blink = 0x%01x;\n", gbeStruct4k.ledCtl02.led0Blink);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led2Mode = 0x%01x;\n", gbeStruct4k.ledCtl02.led2Mode);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.reserved2 = 0x%01x;\n", gbeStruct4k.ledCtl02.reserved2);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led2BlinkMode = 0x%01x;\n", gbeStruct4k.ledCtl02.led2BlinkMode);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led2Invert = 0x%01x;\n", gbeStruct4k.ledCtl02.led2Invert);
+	fprintf(fp, "    gbeStruct4k.ledCtl02.led2Blink = 0x%01x;\n", gbeStruct4k.ledCtl02.led2Blink);
+	fprintf(fp, "\n");
+	/* Word 19h (Reserved) */
+	fprintf(fp, "    /* Word 19h (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord19h = 0x%04x;\n", gbeStruct4k.reservedWord19h);
+	fprintf(fp, "\n");
+	/* Word 1Ah (Reserved) */
+	fprintf(fp, "    /* Word 1Ah (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord1Ah = 0x%04x;\n", gbeStruct4k.reservedWord1Ah);
+	fprintf(fp, "\n");
+	/* Word 1Bh (Reserved) */
+	fprintf(fp, "    /* Word 1Bh (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord1Bh = 0x%04x;\n", gbeStruct4k.reservedWord1Bh);
+	fprintf(fp, "\n");
+	/* Word 1Ch (Reserved) */
+	fprintf(fp, "    /* Word 1Ch (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord1Ch = 0x%04x;\n", gbeStruct4k.reservedWord1Ch);
+	fprintf(fp, "\n");
+	/* Word 1Dh (Reserved) */
+	fprintf(fp, "    /* Word 1Dh (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord1Dh = 0x%04x;\n", gbeStruct4k.reservedWord1Dh);
+	fprintf(fp, "\n");
+	/* Word 1Eh (Device ID for Intel 82567LM gigabit ethernet controller) */
+	fprintf(fp, "    /* Word 1Eh (Device ID for Intel 82567LM gigabit ethernet controller) */\n");
+	fprintf(fp, "    gbeStruct4k._82567lmDeviceId = 0x%04x;\n", gbeStruct4k._82567lmDeviceId);
+	fprintf(fp, "\n");
+	/* Word 1Fh (Device ID for Intel 82567LF gigabit ethernet controller) */
+	fprintf(fp, "    /* Word 1Fh (Device ID for Intel 82567LF gigabit ethernet controller) */\n");
+	fprintf(fp, "    gbeStruct4k._82567lfDeviceId = 0x%04x;\n", gbeStruct4k._82567lfDeviceId);
+	fprintf(fp, "\n");
+	/* Word 20h (Reserved) */
+	fprintf(fp, "    /* Word 20h (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord20h = 0x%04x;\n", gbeStruct4k.reservedWord20h);
+	fprintf(fp, "\n");
+	/* Word 21h (Device ID for Intel 82567V gigabit ethernet controller) */
+	fprintf(fp, "    /* Word 21h (Device ID for Intel 82567V gigabit ethernet controller) */\n");
+	fprintf(fp, "    gbeStruct4k._82567vDeviceId = 0x%04x;\n", gbeStruct4k._82567vDeviceId);
+	fprintf(fp, "\n");
+	/* Word 22h (Reserved) */
+	fprintf(fp, "    /* Word 22h (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord22h = 0x%04x;\n", gbeStruct4k.reservedWord22h);
+	fprintf(fp, "\n");
+	/* Word 23h (Reserved) */
+	fprintf(fp, "    /* Word 23h (Reserved) */\n");
+	fprintf(fp, "    gbeStruct4k.reservedWord23h = 0x%04x;\n", gbeStruct4k.reservedWord23h);
+	fprintf(fp, "\n");
+	/* Words 24h to 2Fh (Reserved) */
+	fprintf(fp, "    /* Words 24h to 2Fh (Reserved) */\n");
+	for (i = 0; i < 12; i++) {
+		fprintf(fp, "    gbeStruct4k.reservedWords24to2Fh[%d] = 0x%04x;\n", i, gbeStruct4k.reservedWords24to2Fh[i]);
+	}
+	fprintf(fp, "\n");
+	/* Words 30h to 3Eh (PXE Software Region) */
+	fprintf(fp, "    /* Words 30h to 3Eh (PXE Software Region) */\n");
+	fprintf(fp, "    /* Boot Agent Main Setup Options (Word 30h) */\n");
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.protocolSelect = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.protocolSelect);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved1 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved1);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.defaultBootSelection = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.defaultBootSelection);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved2 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved2);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.promptTime = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.promptTime);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.displaySetupMessage = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.displaySetupMessage);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved3 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved3);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.forceSpeed = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.forceSpeed);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.forceFullDuplex = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.forceFullDuplex);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved4 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved4);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.efiPresence = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.efiPresence);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.pxePresence = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.pxePresence);
+	fprintf(fp, "    /* Boot Agent Configuration Customization Options (Word 31h) */\n");
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableSetupMenu = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableSetupMenu);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableTitleMessage = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableTitleMessage);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableProtocolSelect = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableProtocolSelect);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableBootSelection = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableBootSelection);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableLegacyWakeupSupport = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableLegacyWakeupSupport);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableFlashUpdate = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableFlashUpdate);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.reserved1 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.reserved1);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.ibaBootOrderSetupMode = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.ibaBootOrderSetupMode);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.reserved2 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.reserved2);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.signature = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.signature);
+	fprintf(fp, "    /* Boot Agent Configuration Customization Options (Word 32h) */\n");
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.buildNumber = 0x%02x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.buildNumber);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.minorVersionNumber = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.minorVersionNumber);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.majorVersionNumber = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.majorVersionNumber);
+	fprintf(fp, "    /* IBA Capabilities (Word 33h) */\n");
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.baseCodePresent = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.baseCodePresent);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.undiCapabilityPresent = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.undiCapabilityPresent);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved1 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved1);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.efiUndiCapabilityPresent = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.efiUndiCapabilityPresent);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved2_0 = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved2_0);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved2_1 = 0x%02x;\n", gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved2_1);
+	fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.signature = 0x%01x;\n", gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.signature);
+	fprintf(fp, "    /* Padding (Words 34h to 3Eh) */\n");
+	for (i = 0; i < 11; i++) {
+		fprintf(fp, "    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[%d] = 0x%04x;\n", i, gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[i]);
+	}
+	fprintf(fp, "\n");
+	/* Word 3Fh (Checksum) */
+	fprintf(fp, "    /* Word 3Fh (Checksum) */\n");
+	fprintf(fp, "    gbeStruct4k.checkSum = 0x%04x;\n", gbeStruct4k.checkSum);
+	fprintf(fp, "\n");
+	/* The rest of Gbe is just padding */
+	paddingSize = sizeof(gbeStruct4k.padding);
+	paddingIdentical = 1; /* Assume that it's all 0xFF, then try to disprove it */
+	for (i = 0; i < paddingSize; i++) { /* check whether contents differ */
+		if (gbeStruct4k.padding[i] != 0xFF) {
+			paddingIdentical = 0;
+			break;
+		}
+	}
+	if (!paddingIdentical) {
+		fprintf(fp, "    /* The rest of Gbe (word 40h or byte 80h onwards) is just padding */\n");
+		for (i = 0; i < paddingSize; i++) { /* contents are not all 0xFF, just spit them all out one by one */
+			fprintf(fp, "    gbeStruct4k.padding[%d] = 0x%02x;\n", i, gbeStruct4k.padding[i]);
+		}
+	} else { /* contents are all 0xFF. Generate a small for loop that sets them all to 0xFF */
+		fprintf(fp, "    /* The rest of Gbe (word 40h or byte 80h onwards) is just padding (0xFF) */\n");
+		fprintf(fp, "    for (i = 0; i < %d; i++) {\n", paddingSize);
+		fprintf(fp, "        gbeStruct4k.padding[i] = 0xFF;\n");
+		fprintf(fp, "    }\n");
+	}
+	fprintf(fp, "\n");
+	fprintf(fp, "    return gbeStruct4k;\n");
+	fprintf(fp, "}\n\n");
+
+	fprintf(fp, "struct GBEREGIONRECORD_8K generatedGbeStruct8k()\n");
+	fprintf(fp, "{\n");
+	fprintf(fp, "    struct GBEREGIONRECORD_8K gbeStruct8k;\n");
+	fprintf(fp, "    gbeStruct8k.main = generatedGbeStruct4k();\n");
+	fprintf(fp, "    memcpy(&gbeStruct8k.backup, &gbeStruct8k.main, GBEREGIONSIZE_4K);\n");
+	fprintf(fp, "    return gbeStruct8k;\n");
+	fprintf(fp, "}\n\n");
+
+	/* ------------------------------ */
+
+	fclose(fp); /* Always close the file when done. */
+
+	return 0;
+}
+
+/*
+ * ---------------------------------------------------------------------
+ * Debugging functions:
+ * ---------------------------------------------------------------------
+ */
+
+/*
+ * show debugging info: show calculated (correct) gbe checksum and what
+ * is actually stored, in a 4K gbe struct. Only for a single region.
+ */
+void printGbeChecksumDataFromStruct4k(struct GBEREGIONRECORD_4K gbeStruct4k, char* romName, char* regionName)
+{
+	printf(
+		"%s Gbe (%s): calculated Gbe checksum: 0x%hx and actual GBe checksum: 0x%hx\n",
+		romName,
+		regionName,
+		gbeGetChecksumFrom4kStruct(gbeStruct4k, GBECHECKSUMTOTAL),
+		gbeStruct4k.checkSum
+	);
+
+	return;
+}
+
+/*
+ * show debugging info: show calculated (correct) gbe checksum and what
+ * is actually stored, in a 8K gbe struct. Do so for main and backup regions.
+ */
+void printGbeChecksumDataFromStruct8k(struct GBEREGIONRECORD_8K gbeStruct8k, char* romName)
+{
+	printGbeChecksumDataFromStruct4k(gbeStruct8k.main, romName, "main");
+	printGbeChecksumDataFromStruct4k(gbeStruct8k.backup, romName, "backup");
+
+	return;
+}
diff --git a/projects/ich9gen/sources/src/gbe/gbe.h b/projects/ich9gen/sources/src/gbe/gbe.h
new file mode 100644
index 00000000..f28f4421
--- /dev/null
+++ b/projects/ich9gen/sources/src/gbe/gbe.h
@@ -0,0 +1,435 @@
+/*
+ *  gbe/gbe.h
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *                     Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+/*
+ * Purpose: provide struct representing gbe region.
+ * Map actual buffers of this regions, directly to instances of these
+ * structs. This makes working with gbe really easy.
+ */
+
+/*
+ * bit fields used, corresponding to datasheet. See links to datasheets
+ * and documentation in ich9deblob.c
+ */
+
+ /*
+ * See docs/hardware/x200_remove_me.html for info plus links to datasheet (also linked below)
+ *
+ * Info about Gbe region (read whole datasheet):
+ * http://www.intel.co.uk/content/dam/doc/application-note/i-o-controller-hub-9m-82567lf-lm-v-nvm-map-appl-note.pdf
+ * https://web.archive.org/web/20150912070329/https://communities.intel.com/community/wired/blog/2010/10/14/how-to-basic-eeprom-checksums
+ */
+
+#ifndef GBESTRUCT_H
+#define GBESTRUCT_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include "../descriptor/descriptor.h"
+
+/* Size of the full gbe region in bytes */
+#define GBEREGIONSIZE_8K 0x2000
+/*
+ * Size of each sub-region in gbe.
+ * gbe contains two regions which
+ * can be identical: main and backup.
+ * These are each half the size of the full region
+ */
+#define GBEREGIONSIZE_4K 0x1000
+
+/*
+ * When adding up the first 0x3F 16-bit words
+ * in a 4KiB GBE region, it should be equal
+ * to 0xBABA
+ */
+#define GBECHECKSUMTOTAL 0xBABA
+
+/*
+ * These will have a modified descriptor+gbe based on what's in the factory.rom
+ * These will be joined into a single 12KiB buffer (descriptor, then gbe) and saved to a file
+ * NOTE: The GBE region of 8K is actually 2x 4K regions in a single region; both 4K blocks can be identical (and by default, are)
+ * The 2nd one is a "backup", but we don't know when it's used. perhaps it's used when the checksum on the first one does not match?
+ */
+
+/*
+ * ---------------------------------------------------------------------
+ * Gbe struct representing the data:
+ * ---------------------------------------------------------------------
+ */
+
+struct GBE_RESERVED_WORD_03H {
+	/* least significant bits */
+	uint8_t reserved1_0                  : 8; /* bits should all be set to zero */
+	uint8_t reserved1_1                  : 3;  /* ^ part of above. Separated so that the bitfields align */
+	uint8_t ibaLom                       : 1;  /* set to 1 for intel boot agent to work (i.e. set it to 0) */
+	uint8_t reserved2 		             : 4;  /* bits should all be set to zero */
+	/* most significant bits */
+};
+
+/* Word 0A */
+struct GBE_PCI_INITIALIZATION_CONTROL_WORD {
+	/* least significant bits */
+	uint8_t loadVendorDeviceId           : 1;  /* 1 = load from NVM. 0 = load from MAC fuses. It's 1 in my deblobbed_descriptor.bin */
+	uint8_t loadSubsystemId              : 1;  /* 1 = load from NVM. 0 = load from MAC fuses. It's 1 in my deblobbed_descriptor.bin */
+	uint8_t reserved1                    : 1;  /* Reserved. Set to 0 (according to datasheet). 0 in my deblobbed_descriptor.bin */
+	uint8_t reserved2                    : 3;  /* Reserved. Set them to 0 (according to datasheet). 0 in my deblobbed_descriptor.bin */
+	uint8_t pmEnable                     : 1;  /* Power Management Enable. 1=Enable. It's 1 in my deblobbed_descriptor.bin */
+	uint8_t auxPwr                       : 1;  /* Auxiliary Power Indication. See datasheet. it's 1 in my deblobbed_descriptor.bin */
+	uint8_t reserved3                    : 4;  /* Reserved. Set to 0000 (according to datasheet). */
+	uint8_t reserved4                    : 4;  /* Reserved. Set to 0001 (according to datasheet). */
+	/* most significant bits */
+};
+
+/* Word 10h. */
+struct GBE_LAN_POWER_CONSUMPTION {
+	/* least significant bits */
+	uint8_t lanD3Power                   : 5;  /* It's 00001b (0x1) in deblobbed_descriptor.bin */
+	uint8_t reserved                     : 3;  /* Reserved. These bits should all be 0. confirmed from deblobbed_descriptor.bin */
+	uint8_t lanD0Power                   : 8;  /* default value: 0x0D (according to datasheet). confirmed from deblobbed_descriptor.bin */
+	/* most significant bits */
+};
+
+/* Word 13h */
+struct GBE_SHARED_INITIALIZATION_CONTROL_WORD {
+	/* least significant bits */
+	uint8_t reserved1                    : 3;  /* Reserved. These bits should be set to 101 (0x5) in binary (according to datasheet and deblobbed_descriptor.bin) */
+	uint8_t forceDuplex                  : 1;  /* Hardware default is 0 according to datasheet and deblobbed_descriptor.bin. Presumably to set whether the chipset is to operate at full- or half-duplex */
+	uint8_t forceSpeedEnable             : 1;  /* Hardware default is 0. Presumably to limited speed eg 10, 10/100, 10/100/1000 */
+	uint8_t reserved2_0                  : 3;  /* Reserved. All bits should be set to 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t reserved2_1                  : 1;  /* ^ part of above. separated so that bitfields align */
+	uint8_t phyPowerDownEnable           : 1;  /* PHY Power Down in D3/Dr (if WoL is disabled), 1 means Enable power down. deblobbed_descriptor.bin says 1 */
+	uint8_t reserved3                    : 1;  /* Reserved. Should be set to 1 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t reserved4                    : 3;  /* Reserved. These bits should all be 0 according to datasheet and deblobbed_descriptor.bin */
+	/* ^ reserved4: indicates whether a valid NVM is present. If invalid, MAC does not read NVM and uses default values. */
+	/* 00 = invalid NVM, 01 = invalid NVM, 10 = valid NVM present, 11 = invalid NVM */
+	/* Default should be 10 (binary) according to datasheet and deblobbed_descriptor.bin */
+	uint8_t sign                         : 2;  /* Make sure to set this to 0x2 (10 in binary) */
+	/* most significant bits */
+};
+
+/* Word 14h */
+struct GBE_EXTENDED_CONFIGURATION_CONTROL_WORD_1 {
+	/* least significant bits */
+	uint16_t extendedConfigurationPointer: 12; /* dword: base address of extended configuration area in NVM. should not be zero. Default is 020h according to datasheet and deblobbed_descriptor.bin */
+	uint8_t oemWriteEnable               : 1;  /* 1=enable. if set, loads oem bits from phy_ctrl register to the 82567. loaded to EXTCNF_CTRL register. default is 1 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t reserved1                    : 1;  /* Reserved. default value 1 according to datasheet and deblobed_descriptor.bin */
+	uint8_t reserved2                    : 1;  /* Reserved. default value 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t reserved3                    : 1;  /* Reserved. default value 0 according to datasheet and deblobbed_descriptor.bin */
+	/* most significant bits */
+};
+
+/* Word 15h */
+struct GBE_EXTENDED_CONFIGURATION_CONTROL_WORD_2 {
+	/* least significant bits */
+	uint8_t reserved                     : 8;  /* Reserved. Should be 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t extendedPhyLength            : 8;  /* dword: size of extended phy configuration area. most be 0 if phy config area is disabled. default is 0000101 (binary) or 05 (hex) according to datasheet, but 00001010 (0A) according to deblobbed_descriptor.bin. Is 0000101 (in the datasheet) a typo that actually means 00001010? */
+	/* most significant bits */
+};
+
+/*
+ * Word 17h: LED 1 Configuration and Power Management
+ *
+ * Default values for LEDCTL register fields controlling LED1 (LINK_1000)
+ * output behaviours and OEM fields that define PHY power management
+ * parameters loaded to the PHY_CTRL register.
+ */
+struct LED_CTL_1 {
+	/* least significant bits */
+
+	/* See page 16 in the datasheet to show the different modes. deblobbed_descriptor.bin has "ACTIVITY" mode set */
+	uint8_t led1Mode                     : 4;  /* Default value 0111 (bin) 7 (hex) says datasheet. 1011 (bin) B (hex) according to deblobbed_descriptor.bin */
+
+	uint8_t reserved1                    : 1;  /* Reserved. Should be 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led1BlinkMode                : 1;  /* 0 = slow blink, 1 = fast blink. should be identical to led0 blink mode. Default is 0 according to datasheet and deblobbed_descriptor.bin */
+	/* By setting this and led0 blink mode (see word 18h) to 1, you could enable a faster blinking on the LED's where the ethernet cable goes
+	 * on the gigabit ethernet port. Not really useful. Slow blink is fine, and probably better (the LED will probably last longer) */
+
+	uint8_t led1Invert                   : 1;  /* initial value of LED1_IVRT field. 0 = led1 has active low output, 1 is high active output. Default is 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led1Blink                    : 1;  /* 1 = led1 blinks, 0 = it does not. default 0 according to datasheet, but it's 1 in deblobbed_descriptor.bin */
+	uint8_t reserved2                    : 1;  /* Reserved. should be 1 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t lpluEnable                   : 1;  /* Low Power Link Up. Enable links at lowest supported speed by both link partners in all power states. 1=enabled(all power states), 0=disabled. Default is 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t lpluEnableNonD0a             : 1;  /* Low Power Link up (non-D0a states). Same as above but only for non-D0a states. default is 1 according to and deblobbed_descriptor.bin */
+	uint8_t gbeDisableNonD0a             : 1;  /* If set to 1, disable gigabit speeds in non-D0a power states. Must be 1 (according to datasheet) because GbE is not supported in Sx mode. It's also set to 1 in deblobbed_descriptor.bin */
+	uint8_t reserved3                    : 2;  /* Reserved. Datasheet says both bits should be 0 (confirmed in deblobbed_descriptor.bin) */
+	uint8_t gbeDisable                   : 1;  /* When 1, gigabit speeds are disabled in all power states including D0a. Default is 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t reserved4                    : 1;  /* Reserved. Should be 1, according to datasheet and deblobbed_descriptor.bin */
+	/* most significant bits */
+};
+
+/*
+ * Word 18: LED 0 and 2 Configuration Defaults
+ *
+ * Hardware defaults for LEDCTL register fields controlling LED0 (LINK/ACTIVITY)
+ * and LED2 (LINK_100) output behaviours.
+ */
+struct LED_CTL_02 {
+	/* least significant bits */
+
+	/* see page 16 in datasheet to show the different modes. deblobbed_descriptor has "LINK-UP" mode set */
+	uint8_t led0Mode                     : 4;  /* default value 0100 (bin) or 4 (hex) according to datasheet. It's 0010 (bin) or 2 (hex) according to deblobbed_descriptor.bin */
+
+	uint8_t reserved1                    : 1;  /* Reserved. Should be set to 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led0BlinkMode                : 1;  /* This should be the same as led1BlinkMode (see word 17h). Default is 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led0Invert                   : 1;  /* initial value of LED0_IVRT field. 0 = led0 has active low output, 1 is high active output. Default is 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led0Blink                    : 1;  /* LED0_BLINK field. Should be 0 according to datasheet and deblobbed_descriptor.bin */
+
+	/* see page 16 in datasheet to shew the different modes. deblobbed_descriptor has "LINK_100" mode set */
+	uint8_t led2Mode                     : 4;  /* default value 0110 (bin) or 6 (hex) according to datasheet and deblobbed_descriptor.bin */
+
+	uint8_t reserved2                    : 1;  /* Reserved. Should be 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led2BlinkMode                : 1;  /* 0 = slow blink. 1 = fast. default 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led2Invert                   : 1;  /* LED2_IVRT field. Should be 0 according to datasheet and deblobbed_descriptor.bin */
+	uint8_t led2Blink                    : 1;  /* LED2_BLINK field. should be 0 according to datasheet and deblobbed_descriptor.bin */
+	/* most significant bits */
+};
+
+/* Word 30h */
+struct GBE_PXE_BOOT_AGENT_MAIN_SETUP_OPTIONS {
+	/* least significant bits */
+	uint8_t protocolSelect               : 2;  /* Default 00 binary (PXE) according to datasheet. 01 is reserved. 10/11 are undefined. deblobbed_descriptor.bin says 00 */
+	uint8_t reserved1                    : 1;  /* Reserved. deblobbed_descriptor.bin says 0 */
+	uint8_t defaultBootSelection         : 2;  /* deblobbed_descriptor.bin says 00 (binary). 00 is network boot, then local. 01 is local boot, then network. 10 is network boot only. 11 is local boot only */
+	uint8_t reserved2                    : 1;  /* Reserved. deblobbed_descriptor.bin says 0. */
+	uint8_t promptTime                   : 2;  /* deblobbed_descriptor.bin says 00. delay for how long "press ctrl-s" setup prompt message appears. 00 = 2 secs, 01 is 3 secs, 10 is 5 secs, 11 is 0 secs. */
+	uint8_t displaySetupMessage          : 1;  /* default 1 says datasheet. deblobbed_descriptor.bin says 1. if 1, "ctrl-s" setup prompt message appears after the title message. */
+	uint8_t reserved3                    : 1;  /* Datasheet says to set 0. deblobbed_descriptor.bin says 0. */
+	uint8_t forceSpeed                   : 2;  /* deblobbed_descriptor.bin says 00. 00 = auto-negotiate, 01 = 10Mbps, 10 = 100Mbps, 11 = "not allowed" */
+	uint8_t forceFullDuplex              : 1;  /* deblobbed_descriptor.bin says 0. Only relevant when bits 10/11 are set; if so, then: 0 = half duplex, 1 = full duplex */
+	uint8_t reserved4                    : 1;  /* Reserved. deblobbed_descriptor.bin says 0. datasheet recommends 0. */
+	uint8_t efiPresence                  : 1;  /* 1 means that an EFI image is present (0 means not present). deblobbed_descriptor.bin says 0. if 1, eeprom word 33h (efi version) becomes valid. if pxePresent is 1, that means EFI and PXE are both present.*/
+	uint8_t pxePresence                  : 1;  /* 0 means that a PXE image is present. 1 means to pxe present. deblobbed_descriptor.bin says 0. if 0, then word 32h (PXE version) in eeprom becomes valid */
+	/* most significant bits */
+
+	/* This whole data structure is pointless, since libreboot doesn't (read: won't)
+	 * include the proprietary intel boot agent. Struct exists here simply for documentations sake. */
+};
+/* Word 31h */
+struct GBE_PXE_BOOT_AGENT_CONFIGURATION_CUSTOMIZATION_OPTIONS_31H {
+	/* least significant bits */
+	uint8_t disableSetupMenu             : 1;  /* 1 means invoking setup menu with ctrl-s won't work. deblobbed_descriptor.bin says 0 (as is default, per datasheet) */
+	uint8_t disableTitleMessage          : 1;  /* 1 means that title in boot agent screen is suppressed, as is ctrl-s message. default is 0, and deblobbed_descriptor.bin says 0 */
+	uint8_t disableProtocolSelect        : 1;  /* 1 means no changes to boot protocol are allowed. default is 0, and deblobbed_descriptor.bin says 0 */
+	uint8_t disableBootSelection         : 1;  /* 1 means no changes in boot order option menu are allowed. default is 0, and deblobbed_descriptor.bin says 0 */
+	uint8_t disableLegacyWakeupSupport   : 1;  /* 1 means no changes in legacy wakeup support menu is allowed. default is 0, and deblobbed_descriptor.bin says 0 */
+	uint8_t disableFlashUpdate           : 1;  /* 1 means no changes to flash image using PROset is allowed. default is 0, and deblobbed_descriptor.bin says 0 */
+	uint8_t reserved1                    : 2;  /* Reserved. Datasheet says these must be 0, and deblobbed_descriptor.bin sets them to 0. */
+
+	/*
+	 * deblobbed_descriptor says 000
+	 * 000 = normal behaviour
+	 * see datasheet (page 21) for other modes.
+	 */
+	uint8_t ibaBootOrderSetupMode        : 3;
+
+	uint8_t reserved2                    : 3;  /* Reserved. Datasheet says these must be set to 0, and deblobbed_descriptor.bin sets them to 0. */
+	uint8_t signature                    : 2;  /* Must be set to 01 to indicate that this whole word has been configured by the agent or other software. deblobbed_descriptor.bin says 01. */
+	/* most significant bits */
+
+	/* This whole data structure is pointless, since libreboot doesn't (read: won't)
+	 * include the proprietary intel boot agent. Struct exists here simply for documentations sake. */
+};
+/* Word 32h */
+struct GBE_PXE_BOOT_AGENT_CONFIGURATION_CUSTOMIZATION_OPTIONS_32H {
+	/* least significant bits */
+	uint8_t buildNumber                  : 8;  /* PXE boot agent build number. default is 28 (hex). deblobbed_descriptor.bin says 18 (hex) */
+	uint8_t minorVersionNumber           : 4;  /* PXE boot agent minor number. default is 2 (hex). deblobbed_descriptor.bin says 3 (hex) */
+	uint8_t majorVersionNumber           : 4;  /* PXE boot agent major number. default is F (hex). deblobbed_descriptor.bin says 1 (hex) */
+	/* most significant bits */
+
+	/* This whole data structure is pointless, since libreboot doesn't (read: won't)
+	 * include the proprietary intel boot agent. Struct exists here simply for documentations sake. */
+};
+/* Word 33h */
+struct GBE_PXE_IBA_CAPABILITIES {
+	/* least significant bits */
+	uint8_t baseCodePresent              : 1;  /* 0 means PXE base code is indicated as being present. 1 (default) means not. deblobbed_descriptor.bin says 1 */
+	uint8_t undiCapabilityPresent        : 1;  /* 1 (default) means pxe/undi capability is indicated present. 0 means not present. deblobbed_descriptor.bin says 1 */
+	uint8_t reserved1                    : 1;  /* Reserved. Must be 1. deblobbed_descriptor.bin says 1 */
+	uint8_t efiUndiCapabilityPresent     : 1;  /* EFI UNDI capability present: 0 (default) means not present. 1 means present. deblobbed_descriptor.bin says 0 */
+	uint8_t reserved2_0                  : 4;  /* reserved. all bits must be 0. deblobbed_descriptor.bin sets them to 0. */
+	uint8_t reserved2_1                  : 6;  /* ^ part of reserved2_0. split this way so that the bitfields align */
+	uint8_t signature                    : 2;  /* must be 01 to indicate that the word is configured by the agent or other software. deblobbed_descriptor.bin says 01 */
+	/* most significant bits */
+
+	/* This whole data structure is pointless, since libreboot doesn't (read: won't)
+	 * include the proprietary intel boot agent. Struct exists here simply for documentations sake. */
+};
+/* Words 30h to 3Eh */
+struct GBE_PXE_SOFTWARE_REGION {
+	struct GBE_PXE_BOOT_AGENT_MAIN_SETUP_OPTIONS bootAgentMainSetupOptions;                                          /* Word 30h */
+	struct GBE_PXE_BOOT_AGENT_CONFIGURATION_CUSTOMIZATION_OPTIONS_31H bootAgentConfigurationCustomizationOptions31h; /* Word 31h */
+	struct GBE_PXE_BOOT_AGENT_CONFIGURATION_CUSTOMIZATION_OPTIONS_32H bootAgentConfigurationCustomizationOptions32h; /* Word 32h */
+	struct GBE_PXE_IBA_CAPABILITIES ibaCapabilities;                                                                 /* Word 33h */
+
+	/* Words 34h to 3Eh (padding). Set these to 0xFFFF (according to deblobbed_descriptor.bin) */
+	uint16_t paddingWords34hTo3Eh[11];
+
+	/*
+	 * the pxe software region  is practically useless in libreboot, since
+	 * libreboot does not include the intel boot agent (it's proprietary software).
+	 *
+	 * Having this struct in place is simply for documentations sake. It is completely
+	 * irrelevant what you put here. filling it with 0xFFFF would probably be fine.
+	 */
+};
+
+struct GBEREGIONRECORD_4K {
+	uint8_t macAddress[6];                             /* Word 00 to 02 */
+	struct GBE_RESERVED_WORD_03H reservedWord03h;            /* Reserved word 03. */
+	uint16_t reservedWord04h;                          /* Reserved word 04: set it to 0xFFFF (according to datasheet and deblobbed_descriptor.bin) */
+	uint16_t imageVersionInformation;                  /* Reserved word 05: 83 10 (little endian) in my deblobbed_descriptor.bin. Set this to 0x1083 (in C, assuming little endian byte order). "cannot be changed" according to datasheet */
+	uint16_t reservedWords06h07h[2];                   /* Reserved words 06-07: set both to 0xFFFF (according to datasheet and deblobbed_descriptor.bin) */
+
+	/*
+	 * Word 08 and 09 (pba low and pba high):
+	 *
+	 * Both of these should be set to 0xFFFF by default, according to the datasheet.
+	 * "nine digit printed board assembly (PBA) number" for intel cards to be stored
+	 * in a 4 byte (read: 2 word) field.
+	 *
+	 * Example: if pba number is 123456-003, then word 08 should be 1234h and word 09 becomes 5603.
+	 * Note: 1234 and 5603 above are big endian. In the image it would actually be 34 12 and 0356
+	 *
+	 * Example: in mine it was (in the image): 08 10 FF FF. That becomes 1008h and FFFFh, or
+	 * basically: 1008FF-0FF. The same was observed in another.
+	 *
+	 * Setting it to FF FF FF FF should be fine, according to the datasheet.
+	 */
+	uint16_t pbaLow;												/* Word 08. Set it to 0x1008 (according to deblobbed_descriptor.bin). */
+	uint16_t pbaHigh;												/* Word 09. Set it to 0xFFFF (according to deblobbed_descriptor.bin). */
+
+	/* Word 0A */
+	struct GBE_PCI_INITIALIZATION_CONTROL_WORD pciInitializationControlWord;
+
+	/*
+	 * Word 0B; subsystem ID
+	 *
+	 * If load subsystem ID bit of word 0A (pci init control word) is
+	 * set to 1 (read: it is. in my deblobbed_descriptor.bin), store
+	 * the subsystem id here. Datasheet says that the default value is
+	 * 0000h, but you should set this to 20EEh (little endian: EE 20)
+	 */
+	uint16_t subsystemId; /* Set this to 0x20EE */
+
+	/*
+	 * Word 0C; subsystem vendor ID
+	 *
+	 * If load subsystem vendor ID bit of word 0A (pci init control word)
+	 * is set to 1 (read: it is. in my deblobbed_descriptor.bin), store
+	 * the subsystem vendor id here. Datasheet says that the default
+	 * value is 8086h, but you should set this to 17AAh (lendian: AA 17).
+	 */
+	uint16_t subsystemVendorId; /* Set this to 0x17AA */
+
+	/*
+	 * Word 0D: device ID
+	 *
+	 * If load vendor/device ID in word 0A (pci init control word) is 1
+	 * (it is) then this word is used to init device id using word 21h,
+	 * 1Eh or 1Fh. In my case, deviceId is 0x10F5. Word 21h is set to
+	 * 0x10CB, word 1Eh is 0x10F5 and 1Fh is 0x10BF
+	 *
+	 * The datasheet says that 10F5 is for Intel 82567LM gigabit ethernet
+	 * controller; 10BF is for Intel 82567LF and 10CB is for Intel 82567V.
+	 *
+	 * Based on this, the X200 is shown to have the Intel 82567LM ethernet
+	 * controller.
+	 */
+	uint16_t deviceId; /* Set this to 0x10F5. */
+	/* It is important that this is correct, for the linux kernel driver */
+
+	/*
+	 * Word 0E: vendor ID
+	 *
+	 * If load vendor/device ID in word 0A (pci init control) is 1 (it is),
+	 * then this word used read to initialize the PCI vendor ID. Default
+	 * value is 8086 according to datasheets, and deblobbed_descriptor.bin.
+	 *
+	 * Intel is often 8086 as a PCI vendor ID. Because 8086. As in the CPU architecture.
+	 */
+	uint16_t vendorId;
+
+	uint16_t deviceRevId;                              /* Word 0F: reserved bits. Set all bits to 0. */
+	struct GBE_LAN_POWER_CONSUMPTION lanPowerConsumption;    /* Word 10: LAN Power Consumption (see struct definition) */
+	uint16_t reservedWords11h12h[2];							/* Words 11-12: Reserved. Set both of them to 0x0000 (according to datasheet). */
+
+	/* Word 13: Shared Initialization Control Word */
+	struct GBE_SHARED_INITIALIZATION_CONTROL_WORD sharedInitializationControlWord;
+
+	/* Word 14: Extended Configuration Control Word 1 */
+	struct GBE_EXTENDED_CONFIGURATION_CONTROL_WORD_1 extendedConfigurationControlWord1;
+
+	/* Word 15: Extended Configuration Control Word 2 */
+	struct GBE_EXTENDED_CONFIGURATION_CONTROL_WORD_2 extendedConfigurationControlWord2;
+
+	/* Word 16: Extended Configuration Control Word 3 */
+	/* All bits reserved. Datasheet and deblobbed_descriptor.bin say to set it to zero */
+	uint16_t extendedConfigurationControlWord3;
+
+	struct LED_CTL_1 ledCtl1;                                /* Word 17: LED 1 Configuration and Power Management */
+	struct LED_CTL_02 ledCtl02;                              /* Word 18: LED 0 and 2 Configuration Defaults */
+	uint16_t reservedWord19h;                          /* Word 19: Reserved. Default is 0x2B00 according to datasheet, but in deblobbed_descriptor.bin it is 0x2B40 */
+	uint16_t reservedWord1Ah;                          /* Word 1A: Reserved. Default is 0x0043 according to datasheet and deblobbed_descriptor.bin */
+	uint16_t reservedWord1Bh;                          /* Word 1B: Reserved. Should be 0x0000 according to datasheet and deblobbed_descriptor.bin */
+	uint16_t reservedWord1Ch;                          /* Word 1C: Reserved. Should be 0x10F5 according to datasheet and deblobbed_descriptor.bin */
+	uint16_t reservedWord1Dh;                          /* Word 1D: Reserved. Should be 0xBAAD according to datasheet and deblobbed_descriptor.bin */
+	uint16_t _82567lmDeviceId;                         /* Word 1E: Device ID for Intel 82567LM gigabit ethernet controller (note: X200 uses this). Should be 0x10F5 according to datasheet and deblobbed_descriptor.bin*/
+	uint16_t _82567lfDeviceId;                         /* Word 1F: Device ID for Intel 82567LF gigabit ethernet controller. Should be 0x10BF according to datasheet and deblobbed_descriptor.bin */
+	uint16_t reservedWord20h;									/* Word 20: Reserved. Should be 0xBAAD according to datasheet and deblobbed_descriptor.bin */
+	uint16_t _82567vDeviceId;                          /* Word 21: Device ID for Intel 82567V gigabit ethernet controller. Should be 0x10CB according to datasheet and deblobbed_descriptor.bin */
+	uint16_t reservedWord22h;                          /* Word 22: Reserved. Should be 0xBAAD according to datasheet and deblobbed_descriptor.bin */
+	uint16_t reservedWord23h;                          /* Word 23: Reserved. Should be 0xBAAD according to datasheet and deblobbed_descriptor.bin */
+	uint16_t reservedWords24to2Fh[12];                 /* Words 24-2F: Reserved. These should all be 0x0000 according to datasheet and deblobbed_descriptor.bin */
+	struct GBE_PXE_SOFTWARE_REGION pxeSoftwareRegion;        /* Words 30-3E: PXE Software Region */
+	uint16_t checkSum; /* when added to the sum of all words above, this should match GBECHECKSUMTOTAL */
+
+	/* set all bytes in here to 0xFF */
+	uint8_t padding[3968];
+};
+
+/*  main and backup region in gbe */
+struct GBEREGIONRECORD_8K {
+	struct GBEREGIONRECORD_4K main;
+	struct GBEREGIONRECORD_4K backup;
+	/*
+	 * Backup region:
+	 * This is actually "main" on X200, since the real main has a bad checksum
+	 * and other errors. You should do what you need on this one (if modifying
+	 * lenovobios's gbe region) and then copy to main
+	 */
+};
+
+/*
+ * ---------------------------------------------------------------------
+ * Function declarations (keep gcc/make happy. check them in gbe.c)
+ * ---------------------------------------------------------------------
+ */
+
+uint16_t gbeGetChecksumFrom4kBuffer(uint16_t* gbeWord, uint16_t desiredValue, int gbeRegionBase);
+uint16_t gbeGetChecksumFrom4kStruct(struct GBEREGIONRECORD_4K gbeStruct4k, uint16_t desiredValue);
+struct GBEREGIONRECORD_8K deblobbedGbeStructFromFactory(struct GBEREGIONRECORD_8K factoryGbeStruct8k);
+int notCreatedHFileForGbeCFile(char* outFileName, char* cFileName);
+int notCreatedCFileFromGbeStruct4k(struct GBEREGIONRECORD_4K gbeStruct4k, char* outFileName, char* headerFileName);
+void printGbeChecksumDataFromStruct4k(struct GBEREGIONRECORD_4K gbeStruct4k, char* romName, char* regionName);
+void printGbeChecksumDataFromStruct8k(struct GBEREGIONRECORD_8K gbeStruct8k, char* romName);
+
+#endif
diff --git a/projects/ich9gen/sources/src/ich9deblob.c b/projects/ich9gen/sources/src/ich9deblob.c
new file mode 100644
index 00000000..d7a57c51
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9deblob.c
@@ -0,0 +1,221 @@
+/*
+ *  ich9deblob.c
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ * Purpose: disable and remove the ME from ich9m/gm45 systems in coreboot.
+ *
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *  Copyright (C) 2014,2015 Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+/* Initially based on proof of concept by Steve Shenton. */
+/* Original utility can be found at https://gitorious.org/ich9descriptortool */
+
+/*
+ * Read a factory.rom dump (ich9m/gm45 systems) and
+ * modify the flash descriptor to remove all regions except descriptor,
+ * Gbe and BIOS. Set BIOS region to full size of the ROM image (after
+ * the flash descriptor and gbe). Basically, deblob the descriptor.
+ *
+ * This will will generate a concatenated descriptor+gbe dump suitable
+ * for use in libreboot. Currently tested: ThinkPad X200 (coreboot/libreboot)
+ */
+
+/*
+ * See docs/hardware/x200_remove_me.html for info plus links to datasheet (also linked below)
+ *
+ * Info about flash descriptor (read page 845 onwards):
+ * http://www.intel.co.uk/content/dam/doc/datasheet/io-controller-hub-9-datasheet.pdf
+ *
+ * Info about Gbe region (read whole datasheet):
+ * http://www.intel.co.uk/content/dam/doc/application-note/i-o-controller-hub-9m-82567lf-lm-v-nvm-map-appl-note.pdf
+ * https://web.archive.org/web/20150912070329/https://communities.intel.com/community/wired/blog/2010/10/14/how-to-basic-eeprom-checksums
+ */
+
+#include "ich9deblob.h"
+
+int main()
+{
+	struct DESCRIPTORREGIONRECORD descriptorStruct;
+	uint8_t* descriptorBuffer = (uint8_t*)&descriptorStruct;
+
+	struct GBEREGIONRECORD_8K gbeStruct8k;
+	uint8_t* gbeBuffer8k = (uint8_t*)&gbeStruct8k;
+	uint32_t gbeRegionStart;
+
+	char* romFilename = "factory.rom";
+	char* descriptorGbeFilename = "deblobbed_descriptor.bin";
+	char* descriptorNoGbeFilename = "deblobbed_4kdescriptor.bin";
+
+	unsigned int bufferLength;
+	unsigned int romSize;
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Compatibility checks. This version of ich9deblob is not yet portable.
+	 * ------------------------------------------------------------------
+	 */
+
+	if (systemOrCompilerIncompatible(descriptorStruct, gbeStruct8k)) return 1;
+	/* If true, fail with error message */
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Extract the descriptor and gbe regions from the factory.rom dump
+	 * ------------------------------------------------------------------
+	 */
+	FILE* fp = NULL;
+	fp = fopen(romFilename, "rb"); /* open factory.rom */
+	if (NULL == fp)
+	{
+		printf("\nerror: could not open %s\n", romFilename);
+		fclose(fp);
+		return 1;
+	}
+	printf("\n%s opened successfully\n", romFilename);
+
+	/*
+	 * Get the descriptor region dump from the factory.rom
+	 * (goes in factoryDescriptorBuffer variable)
+	 */
+	bufferLength = fread(descriptorBuffer, 1, DESCRIPTORREGIONSIZE, fp);
+	if (DESCRIPTORREGIONSIZE != bufferLength) //
+	{
+		printf("\nerror: could not read descriptor from %s (%i) bytes read\n", romFilename, bufferLength);
+		fclose(fp);
+		return 1;
+	}
+	printf("\ndescriptor region read successfully\n");
+
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+	{
+		gbeRegionStart = descriptorStruct.regionSection.flReg3.BASE << FLREGIONBITSHIFT;
+
+		/*
+		 * Set offset so that we can read the data from
+		 * the gbe region
+		 */
+		fseek(fp, gbeRegionStart, SEEK_SET);
+		/* Read the gbe data from the factory.rom and put it in factoryGbeBuffer8k */
+		bufferLength = fread(gbeBuffer8k, 1, GBEREGIONSIZE_8K, fp);
+		if (GBEREGIONSIZE_8K != bufferLength)
+		{
+			printf("\nerror: could not read GBe region from %s (%i) bytes read\n", romFilename, bufferLength);
+			fclose(fp);
+			return 1;
+		}
+		printf("\ngbe (8KiB) region read successfully\n");
+	}
+
+	fseek(fp, 0L, SEEK_END);
+	romSize = ftell(fp);
+	printf("\n%s size: [%i] bytes\n", romFilename, romSize);
+
+	fclose(fp);
+
+	/* Debugging (before modification) */
+	printDescriptorRegionLocations(descriptorStruct, "Original");
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+		printGbeChecksumDataFromStruct8k(gbeStruct8k, "Original");
+	else printf("NO GBE REGION\n");
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Modify the descriptor and gbe regions, ready to go in libreboot.rom
+	 * ------------------------------------------------------------------
+	 */
+
+	/* Delete the ME/Platform regions, place Gbe after the descriptor, resize BIOS region to fill the gap */
+	descriptorStruct = librebootDescriptorStructFromFactory(descriptorStruct, romSize);
+
+	/* The ME is disallowed read-write access to all regions
+	 * (this is probably redundant, since the ME firmware is already removed from libreboot) */
+	descriptorStruct = descriptorMeRegionsForbidden(descriptorStruct);
+	/* Host/CPU is allowed to read/write all regions.
+	 * This makes flashrom -p internal work */
+	descriptorStruct = descriptorHostRegionsUnlocked(descriptorStruct);
+
+	/* Set OEM string */
+	descriptorStruct = descriptorOemString(descriptorStruct);
+
+	/* Modify the Gbe region (see function for details) */
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+		gbeStruct8k = deblobbedGbeStructFromFactory(gbeStruct8k);
+
+	/* Debugging (after modifying the descriptor and gbe regions) */
+	printDescriptorRegionLocations(descriptorStruct, "Modified");
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+		printGbeChecksumDataFromStruct8k(gbeStruct8k, "Modified");
+	else printf("NO GBE REGION\n");
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Create the file with the modified descriptor and gbe inside
+	 * ------------------------------------------------------------------
+	 */
+	printf("\n");
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+	{
+		if (notCreatedDescriptorGbeFile(descriptorStruct, gbeStruct8k, descriptorGbeFilename)) {
+			return 1;
+		}
+	}
+	else
+	{
+		if (notCreated4kDescriptorFile(descriptorStruct, descriptorNoGbeFilename)) {
+			return 1;
+		}
+	}
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Generate ich9gen data (C code that will recreate the deblobbed descriptor+gbe from scratch)
+	 * ------------------------------------------------------------------
+	 */
+	/* Code for generating the Descriptor struct */
+	/* mkdescriptor.h */
+	if (notCreatedHFileForDescriptorCFile("mkdescriptor.h", "mkdescriptor.c")) {
+		return 1;
+	} /* and now mkdescriptor.c */
+	if (notCreatedCFileFromDescriptorStruct(descriptorStruct, "mkdescriptor.c", "mkdescriptor.h")) {
+		return 1;
+	}
+
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+	{
+		/* Code for generating the Gbe struct */
+		/* mkgbe.h */
+		if (notCreatedHFileForGbeCFile("mkgbe.h", "mkgbe.c")) {
+			return 1;
+		} /* and now mkgbe.c */
+		if (notCreatedCFileFromGbeStruct4k(gbeStruct8k.backup, "mkgbe.c", "mkgbe.h")) {
+			return 1;
+		}
+	}
+
+	if (descriptorDefinesGbeRegion(descriptorStruct))
+	{
+		printf("The modified descriptor and gbe regions have also been dumped as src files: mkdescriptor.c, mkdescriptor.h, mkgbe.c, mkgbe.h\n");
+		printf("To use these in ich9gen, place them in src/ich9gen/ and re-build ich9gen.\n\n");
+	}
+	else
+	{
+		printf("The modified descriptor region have also been dumped as src files: mkdescriptor.c, mkdescriptor.h\n");
+		printf("To use these in ich9gen, place them in src/ich9gen/ and re-build ich9gen.\n\n");
+	}
+
+	return 0;
+}
diff --git a/projects/ich9gen/sources/src/ich9deblob.h b/projects/ich9gen/sources/src/ich9deblob.h
new file mode 100644
index 00000000..e00b2c66
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9deblob.h
@@ -0,0 +1,38 @@
+/*
+ *  ich9deblob.h
+ *  This file is part of the ich9deblob utility from the libreboot project
+ *
+ * Purpose: header file for ich9deblob.c
+ *
+ *  Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
+ *                     Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+#ifndef ICH9DEBLOB_H
+#define ICH9DEBLOB_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "common/descriptor_gbe.h"   /* common descriptor/gbe functions used by ich9deblob */
+#include "common/x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */
+#include "descriptor/descriptor.h"   /* structs describing what's in the descriptor region */
+#include "gbe/gbe.h"                 /* structs describing what's in the gbe region */
+
+int main();
+
+#endif
diff --git a/projects/ich9gen/sources/src/ich9gen.c b/projects/ich9gen/sources/src/ich9gen.c
new file mode 100644
index 00000000..4d1e767e
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9gen.c
@@ -0,0 +1,150 @@
+/*
+ *  Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+ *  Copyright (C) 2016 Swift Geek <swiftgeek@gmail.com>
+ *
+ *  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/>.
+ */
+
+/* Generate deblobbed descriptor and gbe 12KiB file from scratch
+ * without relying on a factory.rom dump */
+
+#include "ich9gen.h"
+
+int main(int argc, char *argv[])
+{
+	int i, j;
+
+	struct GBEREGIONRECORD_8K gbeStruct8k = generatedGbeStruct8k();
+	struct DESCRIPTORREGIONRECORD descriptorStruct4M = generatedDescriptorStruct(ROMSIZE_4MB, WITHGBE);
+	struct DESCRIPTORREGIONRECORD descriptorStruct8M = generatedDescriptorStruct(ROMSIZE_8MB, WITHGBE);
+	struct DESCRIPTORREGIONRECORD descriptorStruct16M = generatedDescriptorStruct(ROMSIZE_16MB, WITHGBE);
+	struct DESCRIPTORREGIONRECORD descriptorStructNoGbe4M = generatedDescriptorStruct(ROMSIZE_4MB, WITHOUTGBE);
+	struct DESCRIPTORREGIONRECORD descriptorStructNoGbe8M = generatedDescriptorStruct(ROMSIZE_8MB, WITHOUTGBE);
+	struct DESCRIPTORREGIONRECORD descriptorStructNoGbe16M = generatedDescriptorStruct(ROMSIZE_16MB, WITHOUTGBE);
+
+	/* Only for the compatibility checks */
+	struct DESCRIPTORREGIONRECORD dummyDescriptorStruct;
+	struct GBEREGIONRECORD_8K dummyGbeStruct8k;
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Compatibility checks. This version of ich9deblob is not yet portable.
+	 * ------------------------------------------------------------------
+	 */
+
+	if (systemOrCompilerIncompatible(dummyDescriptorStruct, dummyGbeStruct8k)) return 1;
+	/* If true, fail with error message */
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Arguments given on the terminal
+	 * ------------------------------------------------------------------
+	 */
+
+
+	if(argc==3) {
+
+		/* If user provides their own MAC address, it will be used.
+		 * Otherwise, ich9gen will simply use the default one.
+		 *
+		 * However, if the user provides an invalid MAC address, then ich9gen
+		 * will exit. */
+		if(0==strcmp(argv[1],"--macaddress")) {
+			/* 6 hex chars format (example): AA:BB:CC:DD:EE:FF */
+			if (strlen(argv[2]) != 17) {
+				printf("ich9gen: invalid mac address format (wrong length)\n");
+				return 1;
+			}
+			for(i=2; i<14; i+=3) {
+				if(argv[2][i]!=':') {
+					printf("ich9gen: invalid mac address format (non-colon characters used as spacing)\n");
+					return 1;
+				}
+			}
+			for(i=0; i<6; i++) {
+				gbeStruct8k.main.macAddress[i] = 0;
+
+				/* Go through each nibble of the byte */
+				for(j=0; j<2; j++) {
+					if(argv[2][(i*3)+j]>='a' && argv[2][(i*3)+j]<='f')
+						gbeStruct8k.main.macAddress[i] |= (uint8_t)((argv[2][(i*3)+j] - 87) << ((j^1) << 2));
+					else if(argv[2][(i*3)+j]>='A' && argv[2][(i*3)+j]<='F')
+						gbeStruct8k.main.macAddress[i] |= (uint8_t)((argv[2][(i*3)+j] - 55) << ((j^1) << 2));
+					else if(argv[2][(i*3)+j]>='0' && argv[2][(i*3)+j]<='9')
+						gbeStruct8k.main.macAddress[i] |= (uint8_t)((argv[2][(i*3)+j] - 48) << ((j^1) << 2));
+					else {
+						printf("ich9gen: invalid mac address format (non-hex characters)\n");
+						return 1;
+					}
+				}
+			}
+
+			gbeStruct8k.main.checkSum = gbeGetChecksumFrom4kStruct(gbeStruct8k.main, GBECHECKSUMTOTAL); /* Fix the checksum */
+			memcpy(&gbeStruct8k.backup, &gbeStruct8k.main, GBEREGIONSIZE_4K); /* Copy to the backup */
+
+			/* Generate ich9gen data (C code for Gbe region): */
+
+			/* mkgbe.h */
+			if (notCreatedHFileForGbeCFile("mkgbe.h", "mkgbe.c")) {
+				return 1;
+			} /* and now mkgbe.c */
+			if (notCreatedCFileFromGbeStruct4k(gbeStruct8k.backup, "mkgbe.c", "mkgbe.h")) {
+				return 1;
+			}
+
+			printf("You selected to change the MAC address in the Gbe section. This has been done.\n\n");
+
+			printf("The modified gbe region has also been dumped as src files: mkgbe.c, mkgbe.h\n");
+			printf("To use these in ich9gen, place them in src/ich9gen/ and re-build ich9gen.\n\n");
+		}
+
+	}
+
+	/*
+	 * ------------------------------------------------------------------
+	 * Generate the 12KiB files, ready to be used in a libreboot image
+	 * ------------------------------------------------------------------
+	 */
+
+	if (notCreatedDescriptorGbeFile(descriptorStruct4M, gbeStruct8k, "ich9fdgbe_4m.bin")) {
+		return 1;
+	}
+
+	if (notCreatedDescriptorGbeFile(descriptorStruct8M, gbeStruct8k, "ich9fdgbe_8m.bin")) {
+		return 1;
+	}
+
+	if (notCreatedDescriptorGbeFile(descriptorStruct16M, gbeStruct8k, "ich9fdgbe_16m.bin")) {
+		return 1;
+	}
+	/*
+	 * ------------------------------------------------------------------
+	 * Generate the 4KiB files (descriptors without GbE), ready to be used in a libreboot image
+	 * In these descriptors, the onboard Intel GbE NIC is disabled; a discrete one is used instead
+	 * ------------------------------------------------------------------
+	 */
+
+	if (notCreated4kDescriptorFile(descriptorStructNoGbe4M, "ich9fdnogbe_4m.bin")) {
+		return 1;
+	}
+
+	if (notCreated4kDescriptorFile(descriptorStructNoGbe8M, "ich9fdnogbe_8m.bin")) {
+		return 1;
+	}
+
+	if (notCreated4kDescriptorFile(descriptorStructNoGbe16M, "ich9fdnogbe_16m.bin")) {
+		return 1;
+	}
+	return 0;
+}
diff --git a/projects/ich9gen/sources/src/ich9gen.h b/projects/ich9gen/sources/src/ich9gen.h
new file mode 100644
index 00000000..c558e04a
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9gen.h
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (C) 2014 Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+/* Header file for ich9gen.c */
+
+#ifndef ICH9GEN_H
+#define ICH9GEN_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "ich9gen/mkdescriptor.h"
+#include "ich9gen/mkgbe.h"
+#include "common/descriptor_gbe.h"   /* common descriptor/gbe functions used by ich9deblob */
+#include "common/x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */
+#include "descriptor/descriptor.h"   /* structs describing what's in the descriptor region */
+#include "gbe/gbe.h"                 /* structs describing what's in the gbe region */
+
+#define WITHGBE 1
+#define WITHOUTGBE 0
+
+int main(int argc, char *argv[]);
+
+#endif
diff --git a/projects/ich9gen/sources/src/ich9gen/mkdescriptor.c b/projects/ich9gen/sources/src/ich9gen/mkdescriptor.c
new file mode 100644
index 00000000..09669ccf
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9gen/mkdescriptor.c
@@ -0,0 +1,228 @@
+/*
+ *  Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+#include "mkdescriptor.h"
+
+/* Generate a 4KiB Descriptor struct, with default values. */
+/* Read ../descriptor/descriptor.h for an explanation of the default values used here */
+
+struct DESCRIPTORREGIONRECORD generatedDescriptorStruct(unsigned int romSize, int hasGbe)
+{
+    int i;
+    struct DESCRIPTORREGIONRECORD descriptorStruct;
+
+    /* Flash Valid Signature Register */
+    descriptorStruct.flValSig.signature = 0x0ff0a55a;
+
+    /* Flash Map Registers */
+    /* FLMAP0 */
+    descriptorStruct.flMaps.flMap0.FCBA = 0x01;
+    descriptorStruct.flMaps.flMap0.NC = 0x0;
+    descriptorStruct.flMaps.flMap0.reserved1 = 0x00;
+    descriptorStruct.flMaps.flMap0.FRBA = 0x04;
+    descriptorStruct.flMaps.flMap0.NR = hasGbe ? 0x2 : 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.flMaps.flMap0.reserved2 = 0x00;
+    /* FLMAP1 */
+    descriptorStruct.flMaps.flMap1.FMBA = 0x06;
+    descriptorStruct.flMaps.flMap1.NM = 0x2;
+    descriptorStruct.flMaps.flMap1.reserved = 0x00;
+    descriptorStruct.flMaps.flMap1.FISBA = 0x10;
+    descriptorStruct.flMaps.flMap1.ISL = 0x02;
+    /* FLMAP2 */
+    descriptorStruct.flMaps.flMap2.FMSBA = 0x20;
+    descriptorStruct.flMaps.flMap2.MSL = 0x01;
+    descriptorStruct.flMaps.flMap2.reserved = 0x0000;
+
+    /* Component Section Record */
+    /* FLCOMP */
+    descriptorStruct.componentSection.flcomp.component1Density = componentDensity(romSize);
+    descriptorStruct.componentSection.flcomp.component2Density = componentDensity(romSize);
+    descriptorStruct.componentSection.flcomp.reserved1 = 0x0;
+    descriptorStruct.componentSection.flcomp.reserved2 = 0x00;
+    descriptorStruct.componentSection.flcomp.reserved3 = 0x0;
+    descriptorStruct.componentSection.flcomp.readClockFrequency = 0x0;
+    descriptorStruct.componentSection.flcomp.fastReadSupport = 0x1;
+    descriptorStruct.componentSection.flcomp.fastreadClockFrequency = 0x1;
+    descriptorStruct.componentSection.flcomp.writeEraseClockFrequency = 0x0;
+    descriptorStruct.componentSection.flcomp.readStatusClockFrequency = 0x0;
+    descriptorStruct.componentSection.flcomp.reserved4 = 0x0;
+    /* FLILL */
+    descriptorStruct.componentSection.flill = 0x00000000;
+    /* FLPB */
+    descriptorStruct.componentSection.flpb = 0x00000000;
+    /* Padding */
+    for (i = 0; i < 36; i++) {
+        descriptorStruct.componentSection.padding[i] = 0xFF;
+    }
+
+    /* Flash Descriptor Region Section */
+    /* FLREG0 (Descriptor) */
+    descriptorStruct.regionSection.flReg0.BASE = 0x0000;
+    descriptorStruct.regionSection.flReg0.reserved1 = 0x0;
+    descriptorStruct.regionSection.flReg0.LIMIT = 0x0000;
+    descriptorStruct.regionSection.flReg0.reserved2 = 0x0;
+    /* FLREG1 (BIOS) */
+    descriptorStruct.regionSection.flReg1.BASE = (DESCRIPTORREGIONSIZE + (hasGbe ? GBEREGIONSIZE_8K : 0)) >> FLREGIONBITSHIFT; /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg1.reserved1 = 0x0;
+    descriptorStruct.regionSection.flReg1.LIMIT = ((romSize >> FLREGIONBITSHIFT) - 1); /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg1.reserved2 = 0x0;
+    /* FLREG2 (ME) */
+    descriptorStruct.regionSection.flReg2.BASE = 0x1fff; /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg2.reserved1 = 0x0;
+    descriptorStruct.regionSection.flReg2.LIMIT = 0x0000; /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg2.reserved2 = 0x0;
+    /* FLREG3 (Gbe) */
+    descriptorStruct.regionSection.flReg3.BASE = hasGbe ? (DESCRIPTORREGIONSIZE >> FLREGIONBITSHIFT) : 0x1fff; /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg3.reserved1 = 0x0;
+    descriptorStruct.regionSection.flReg3.LIMIT = hasGbe ? (GBEREGIONSIZE_8K >> FLREGIONBITSHIFT) : 0x0000; /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg3.reserved2 = 0x0;
+    /* FLREG4 (Platform) */
+    descriptorStruct.regionSection.flReg4.BASE = 0x1fff; /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg4.reserved1 = 0x0;
+    descriptorStruct.regionSection.flReg4.LIMIT = 0x0000; /* see ../descriptor/descriptor.c */
+    descriptorStruct.regionSection.flReg4.reserved2 = 0x0;
+    /* Padding */
+    for (i = 0; i < 12; i++) {
+        descriptorStruct.regionSection.padding[i] = 0xFF;
+    }
+
+    /* Master Access Section */
+    /* FLMSTR1 (Host CPU / BIOS) */
+    descriptorStruct.masterAccessSection.flMstr1.requesterId = 0x0000;
+    descriptorStruct.masterAccessSection.flMstr1.fdRegionReadAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.biosRegionReadAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.meRegionReadAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.gbeRegionReadAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.pdRegionReadAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.reserved1 = 0x0;
+    descriptorStruct.masterAccessSection.flMstr1.fdRegionWriteAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.biosRegionWriteAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.meRegionWriteAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.gbeRegionWriteAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.pdRegionWriteAccess = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr1.reserved2 = 0x0;
+    /* FLMSTR2 (ME) */
+    descriptorStruct.masterAccessSection.flMstr2.requesterId = 0x0000;
+    descriptorStruct.masterAccessSection.flMstr2.fdRegionReadAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.biosRegionReadAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.meRegionReadAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.gbeRegionReadAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.pdRegionReadAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.reserved1 = 0x0;
+    descriptorStruct.masterAccessSection.flMstr2.fdRegionWriteAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.biosRegionWriteAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.meRegionWriteAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.gbeRegionWriteAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.pdRegionWriteAccess = 0x0; /* see ../descriptor/descriptor.c */
+    descriptorStruct.masterAccessSection.flMstr2.reserved2 = 0x0;
+    /* FLMSTR3 (Gbe) */
+    descriptorStruct.masterAccessSection.flMstr3.requesterId = 0x0218;
+    descriptorStruct.masterAccessSection.flMstr3.fdRegionReadAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.biosRegionReadAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.meRegionReadAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.gbeRegionReadAccess = 0x1;
+    descriptorStruct.masterAccessSection.flMstr3.pdRegionReadAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.reserved1 = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.fdRegionWriteAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.biosRegionWriteAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.meRegionWriteAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.gbeRegionWriteAccess = 0x1;
+    descriptorStruct.masterAccessSection.flMstr3.pdRegionWriteAccess = 0x0;
+    descriptorStruct.masterAccessSection.flMstr3.reserved2 = 0x0;
+    /* Padding */
+    for (i = 0; i < 148; i++) {
+        descriptorStruct.masterAccessSection.padding[i] = 0xFF;
+    }
+
+    /* ICH straps */
+    /* ICHSTRAP0 */
+    descriptorStruct.ichStraps.ichStrap0.meDisable = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.ichStraps.ichStrap0.reserved1 = 0x04;
+    descriptorStruct.ichStraps.ichStrap0.tcoMode = 0x1;
+    descriptorStruct.ichStraps.ichStrap0.smBusAddress = 0x64;
+    descriptorStruct.ichStraps.ichStrap0.bmcMode = 0x0;
+    descriptorStruct.ichStraps.ichStrap0.tripPointSelect = 0x0;
+    descriptorStruct.ichStraps.ichStrap0.reserved2 = 0x0;
+    descriptorStruct.ichStraps.ichStrap0.integratedGbe = hasGbe ? 0x1 : 0x0;
+    descriptorStruct.ichStraps.ichStrap0.lanPhy = hasGbe ? 0x1 : 0x0;
+    descriptorStruct.ichStraps.ichStrap0.reserved3 = 0x0;
+    descriptorStruct.ichStraps.ichStrap0.dmiRequesterId = 0x0;
+    descriptorStruct.ichStraps.ichStrap0.smBus2Address = 0x00;
+    /* ICHSTRAP1 */
+    descriptorStruct.ichStraps.ichStrap1.northMlink = 0x1;
+    descriptorStruct.ichStraps.ichStrap1.southMlink = 0x1;
+    descriptorStruct.ichStraps.ichStrap1.meSmbus = 0x1;
+    descriptorStruct.ichStraps.ichStrap1.sstDynamic = 0x1;
+    descriptorStruct.ichStraps.ichStrap1.reserved1 = 0x0;
+    descriptorStruct.ichStraps.ichStrap1.northMlink2 = 0x1;
+    descriptorStruct.ichStraps.ichStrap1.reserved2 = 0x00;
+    descriptorStruct.ichStraps.ichStrap1.reserved3 = 0x0000;
+    /* Padding */
+    for (i = 0; i < 248; i++) {
+        descriptorStruct.ichStraps.padding[i] = 0xFF;
+    }
+
+    /* MCH straps */
+    /* MCHSTRAP0 */
+    descriptorStruct.mchStraps.mchStrap0.meDisable = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.mchStraps.mchStrap0.meBootFromFlash = 0x0;
+    descriptorStruct.mchStraps.mchStrap0.tpmDisable = 0x1; /* see ../descriptor/descriptor.c */
+    descriptorStruct.mchStraps.mchStrap0.reserved1 = 0x7;
+    descriptorStruct.mchStraps.mchStrap0.spiFingerprint = 0x1;
+    descriptorStruct.mchStraps.mchStrap0.meAlternateDisable = 0x0;
+    descriptorStruct.mchStraps.mchStrap0.reserved2 = 0xff;
+    descriptorStruct.mchStraps.mchStrap0.reserved3 = 0xffff;
+    /* Padding */
+    for (i = 0; i < 3292; i++) {
+        descriptorStruct.mchStraps.padding[i] = 0xFF;
+    }
+
+    /* ME VSCC Table */
+    descriptorStruct.meVsccTable.jid0 = 0x001720c2;
+    descriptorStruct.meVsccTable.vscc0 = 0x20052005;
+    descriptorStruct.meVsccTable.jid1 = 0x001730ef;
+    descriptorStruct.meVsccTable.vscc1 = 0x20052005;
+    descriptorStruct.meVsccTable.jid2 = 0x0000481f;
+    descriptorStruct.meVsccTable.vscc2 = 0x20152015;
+    /* Padding */
+    for (i = 0; i < 4; i++) {
+        descriptorStruct.meVsccTable.padding[i] = 0xFF;
+    }
+
+    /* Descriptor Map 2 Record */
+    descriptorStruct.descriptor2Map.meVsccTableBaseAddress = 0xee;
+    descriptorStruct.descriptor2Map.meVsccTableLength = 0x06;
+    descriptorStruct.descriptor2Map.reserved = 0x0000;
+
+    /* OEM section */
+    /* see ../descriptor/descriptor.c */
+    /* Magic String (ascii characters) */
+    descriptorStruct.oemSection.magicString[0] = 0x4c;
+    descriptorStruct.oemSection.magicString[1] = 0x49;
+    descriptorStruct.oemSection.magicString[2] = 0x42;
+    descriptorStruct.oemSection.magicString[3] = 0x45;
+    descriptorStruct.oemSection.magicString[4] = 0x52;
+    descriptorStruct.oemSection.magicString[5] = 0x41;
+    descriptorStruct.oemSection.magicString[6] = 0x54;
+    descriptorStruct.oemSection.magicString[7] = 0x45;
+    /* Padding */
+    for (i = 0; i < 248; i++) {
+        descriptorStruct.oemSection.padding[i] = 0xFF;
+    }
+
+    return descriptorStruct;
+}
diff --git a/projects/ich9gen/sources/src/ich9gen/mkdescriptor.h b/projects/ich9gen/sources/src/ich9gen/mkdescriptor.h
new file mode 100644
index 00000000..8663db8c
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9gen/mkdescriptor.h
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2014 Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+#ifndef ICH9GEN_MKDESCRIPTOR_H
+#define ICH9GEN_MKDESCRIPTOR_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include "../descriptor/descriptor.h"
+
+struct DESCRIPTORREGIONRECORD generatedDescriptorStruct(unsigned int romSize, int hasGbe);
+#endif
diff --git a/projects/ich9gen/sources/src/ich9gen/mkgbe.c b/projects/ich9gen/sources/src/ich9gen/mkgbe.c
new file mode 100644
index 00000000..099ab5b7
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9gen/mkgbe.c
@@ -0,0 +1,256 @@
+/*
+ *  Copyright (C) 2014 Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+#include "mkgbe.h"
+
+/* Generate a 4KiB Gbe struct, with default values. */
+/* Read ../gbe/gbe.h for an explanation of the default values used here */
+
+struct GBEREGIONRECORD_4K generatedGbeStruct4k()
+{
+    int i;
+    struct GBEREGIONRECORD_4K gbeStruct4k;
+
+    /* MAC address (words 00h to 02h) */
+    /* see ../gbe/gbe.c */
+    gbeStruct4k.macAddress[0] = 0x00;
+    gbeStruct4k.macAddress[1] = 0xDE;
+    gbeStruct4k.macAddress[2] = 0xAD;
+    gbeStruct4k.macAddress[3] = 0xC0;
+    gbeStruct4k.macAddress[4] = 0xFF;
+    gbeStruct4k.macAddress[5] = 0xEE;
+
+    /* Word 03h (Reserved) */
+    gbeStruct4k.reservedWord03h.reserved1_0 = 0x00;
+    gbeStruct4k.reservedWord03h.reserved1_1 = 0x0;
+    gbeStruct4k.reservedWord03h.ibaLom = 0x1;
+    gbeStruct4k.reservedWord03h.reserved2 = 0x0;
+
+    /* Word 04h (Reserved) */
+    gbeStruct4k.reservedWord04h = 0xffff;
+
+    /* Word 05h (Image Version Information) */
+    gbeStruct4k.imageVersionInformation = 0x1083;
+
+    /* Words 06h and 07h (Reserved) */
+    gbeStruct4k.reservedWords06h07h[0] = 0xffff;
+    gbeStruct4k.reservedWords06h07h[1] = 0xffff;
+
+    /* Word 08h and 09h (PBA Low and PBA High) */
+    gbeStruct4k.pbaLow = 0x1008;
+    gbeStruct4k.pbaHigh = 0xffff;
+
+    /* Word 0Ah (PCI Initialization Control Word) */
+    gbeStruct4k.pciInitializationControlWord.loadVendorDeviceId = 0x1;
+    gbeStruct4k.pciInitializationControlWord.loadSubsystemId = 0x1;
+    gbeStruct4k.pciInitializationControlWord.reserved1 = 0x0;
+    gbeStruct4k.pciInitializationControlWord.reserved2 = 0x0;
+    gbeStruct4k.pciInitializationControlWord.pmEnable = 0x1;
+    gbeStruct4k.pciInitializationControlWord.auxPwr = 0x1;
+    gbeStruct4k.pciInitializationControlWord.reserved3 = 0x0;
+    gbeStruct4k.pciInitializationControlWord.reserved4 = 0x1;
+
+    /* Word 0Bh (Subsystem ID) */
+    gbeStruct4k.subsystemId = 0x20ee;
+
+    /* Word 0Ch (Subsystem Vendor ID) */
+    gbeStruct4k.subsystemVendorId = 0x17aa;
+
+    /* Word 0Dh (Device ID) */
+    gbeStruct4k.deviceId = 0x10f5;
+
+    /* Word 0Eh (Vendor ID) */
+    gbeStruct4k.vendorId = 0x8086;
+
+    /* Word 0Fh (Device Revision ID) */
+    gbeStruct4k.deviceRevId = 0x0000;
+
+    /* Word 10h (LAN Power Consumption) */
+    gbeStruct4k.lanPowerConsumption.lanD3Power = 0x01;
+    gbeStruct4k.lanPowerConsumption.reserved = 0x0;
+    gbeStruct4k.lanPowerConsumption.lanD0Power = 0x0d;
+
+    /* Words 11h and 12h (Reserved) */
+    gbeStruct4k.reservedWords11h12h[0] = 0x0000;
+    gbeStruct4k.reservedWords11h12h[1] = 0x0000;
+
+    /* Word 13h (Shared Initialization Control Word) */
+    gbeStruct4k.sharedInitializationControlWord.reserved1 = 0x5;
+    gbeStruct4k.sharedInitializationControlWord.forceDuplex = 0x0;
+    gbeStruct4k.sharedInitializationControlWord.forceSpeedEnable = 0x0;
+    gbeStruct4k.sharedInitializationControlWord.reserved2_0 = 0x0;
+    gbeStruct4k.sharedInitializationControlWord.reserved2_1 = 0x0;
+    gbeStruct4k.sharedInitializationControlWord.phyPowerDownEnable = 0x1;
+    gbeStruct4k.sharedInitializationControlWord.reserved3 = 0x1;
+    gbeStruct4k.sharedInitializationControlWord.reserved4 = 0x0;
+    gbeStruct4k.sharedInitializationControlWord.sign = 0x2;
+
+    /* Word 14h (Extended Configuration Control Word 1) */
+    gbeStruct4k.extendedConfigurationControlWord1.extendedConfigurationPointer = 0x020;
+    gbeStruct4k.extendedConfigurationControlWord1.oemWriteEnable = 0x1;
+    gbeStruct4k.extendedConfigurationControlWord1.reserved1 = 0x1;
+    gbeStruct4k.extendedConfigurationControlWord1.reserved2 = 0x0;
+    gbeStruct4k.extendedConfigurationControlWord1.reserved3 = 0x0;
+
+    /* Word 15h (Extended Configuration Control Word 2) */
+    gbeStruct4k.extendedConfigurationControlWord2.reserved = 0x00;
+    gbeStruct4k.extendedConfigurationControlWord2.extendedPhyLength = 0x0a;
+
+    /* Word 16h (Extended Configuration Control Word 3) */
+    gbeStruct4k.extendedConfigurationControlWord3 = 0x0000;
+
+    /* Word 17h (LED 1 Configuration and Power Management) */
+    gbeStruct4k.ledCtl1.led1Mode = 0xb;
+    gbeStruct4k.ledCtl1.reserved1 = 0x0;
+    gbeStruct4k.ledCtl1.led1BlinkMode = 0x0;
+    gbeStruct4k.ledCtl1.led1Invert = 0x0;
+    gbeStruct4k.ledCtl1.led1Blink = 0x1;
+    gbeStruct4k.ledCtl1.reserved2 = 0x1;
+    gbeStruct4k.ledCtl1.lpluEnable = 0x0;
+    gbeStruct4k.ledCtl1.lpluEnableNonD0a = 0x1;
+    gbeStruct4k.ledCtl1.gbeDisableNonD0a = 0x1;
+    gbeStruct4k.ledCtl1.reserved3 = 0x0;
+    gbeStruct4k.ledCtl1.gbeDisable = 0x0;
+    gbeStruct4k.ledCtl1.reserved4 = 0x1;
+
+    /* Word 18h (LED 0 and 2 Configuration Defaults) */
+    gbeStruct4k.ledCtl02.led0Mode = 0x2;
+    gbeStruct4k.ledCtl02.reserved1 = 0x0;
+    gbeStruct4k.ledCtl02.led0BlinkMode = 0x0;
+    gbeStruct4k.ledCtl02.led0Invert = 0x0;
+    gbeStruct4k.ledCtl02.led0Blink = 0x0;
+    gbeStruct4k.ledCtl02.led2Mode = 0x6;
+    gbeStruct4k.ledCtl02.reserved2 = 0x0;
+    gbeStruct4k.ledCtl02.led2BlinkMode = 0x0;
+    gbeStruct4k.ledCtl02.led2Invert = 0x0;
+    gbeStruct4k.ledCtl02.led2Blink = 0x0;
+
+    /* Word 19h (Reserved) */
+    gbeStruct4k.reservedWord19h = 0x2b40;
+
+    /* Word 1Ah (Reserved) */
+    gbeStruct4k.reservedWord1Ah = 0x0043;
+
+    /* Word 1Bh (Reserved) */
+    gbeStruct4k.reservedWord1Bh = 0x0000;
+
+    /* Word 1Ch (Reserved) */
+    gbeStruct4k.reservedWord1Ch = 0x10f5;
+
+    /* Word 1Dh (Reserved) */
+    gbeStruct4k.reservedWord1Dh = 0xbaad;
+
+    /* Word 1Eh (Device ID for Intel 82567LM gigabit ethernet controller) */
+    gbeStruct4k._82567lmDeviceId = 0x10f5;
+
+    /* Word 1Fh (Device ID for Intel 82567LF gigabit ethernet controller) */
+    gbeStruct4k._82567lfDeviceId = 0x10bf;
+
+    /* Word 20h (Reserved) */
+    gbeStruct4k.reservedWord20h = 0xbaad;
+
+    /* Word 21h (Device ID for Intel 82567V gigabit ethernet controller) */
+    gbeStruct4k._82567vDeviceId = 0x10cb;
+
+    /* Word 22h (Reserved) */
+    gbeStruct4k.reservedWord22h = 0xbaad;
+
+    /* Word 23h (Reserved) */
+    gbeStruct4k.reservedWord23h = 0xbaad;
+
+    /* Words 24h to 2Fh (Reserved) */
+    gbeStruct4k.reservedWords24to2Fh[0] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[1] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[2] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[3] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[4] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[5] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[6] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[7] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[8] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[9] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[10] = 0x0000;
+    gbeStruct4k.reservedWords24to2Fh[11] = 0x0000;
+
+    /* Words 30h to 3Eh (PXE Software Region) */
+    /* Boot Agent Main Setup Options (Word 30h) */
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.protocolSelect = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved1 = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.defaultBootSelection = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved2 = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.promptTime = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.displaySetupMessage = 0x1;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved3 = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.forceSpeed = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.forceFullDuplex = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.reserved4 = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.efiPresence = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentMainSetupOptions.pxePresence = 0x0;
+    /* Boot Agent Configuration Customization Options (Word 31h) */
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableSetupMenu = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableTitleMessage = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableProtocolSelect = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableBootSelection = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableLegacyWakeupSupport = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.disableFlashUpdate = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.reserved1 = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.ibaBootOrderSetupMode = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.reserved2 = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions31h.signature = 0x1;
+    /* Boot Agent Configuration Customization Options (Word 32h) */
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.buildNumber = 0x18;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.minorVersionNumber = 0x3;
+    gbeStruct4k.pxeSoftwareRegion.bootAgentConfigurationCustomizationOptions32h.majorVersionNumber = 0x1;
+    /* IBA Capabilities (Word 33h) */
+    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.baseCodePresent = 0x1;
+    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.undiCapabilityPresent = 0x1;
+    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved1 = 0x1;
+    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.efiUndiCapabilityPresent = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved2_0 = 0x0;
+    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.reserved2_1 = 0x00;
+    gbeStruct4k.pxeSoftwareRegion.ibaCapabilities.signature = 0x1;
+    /* Padding (Words 34h to 3Eh) */
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[0] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[1] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[2] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[3] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[4] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[5] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[6] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[7] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[8] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[9] = 0xffff;
+    gbeStruct4k.pxeSoftwareRegion.paddingWords34hTo3Eh[10] = 0xffff;
+
+    /* Word 3Fh (Checksum) */
+    gbeStruct4k.checkSum = 0x348a;
+
+    /* The rest of Gbe (word 40h or byte 80h onwards) is just padding (0xFF) */
+    for (i = 0; i < 3968; i++) {
+        gbeStruct4k.padding[i] = 0xFF;
+    }
+
+    return gbeStruct4k;
+}
+
+struct GBEREGIONRECORD_8K generatedGbeStruct8k()
+{
+    struct GBEREGIONRECORD_8K gbeStruct8k;
+    gbeStruct8k.main = generatedGbeStruct4k();
+    memcpy(&gbeStruct8k.backup, &gbeStruct8k.main, GBEREGIONSIZE_4K);
+    return gbeStruct8k;
+}
diff --git a/projects/ich9gen/sources/src/ich9gen/mkgbe.h b/projects/ich9gen/sources/src/ich9gen/mkgbe.h
new file mode 100644
index 00000000..16974172
--- /dev/null
+++ b/projects/ich9gen/sources/src/ich9gen/mkgbe.h
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (C) 2014 Leah Rowe <info@minifree.org>
+ *
+ *  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/>.
+ */
+
+#ifndef ICH9GEN_MKGBE_H
+#define ICH9GEN_MKGBE_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include "../gbe/gbe.h"
+
+struct GBEREGIONRECORD_4K generatedGbeStruct4k();
+struct GBEREGIONRECORD_8K generatedGbeStruct8k();
+
+#endif
diff --git a/projects/memtest86plus/configs/install b/projects/memtest86plus/configs/install
index 4092a417..6d1d72a2 100644
--- a/projects/memtest86plus/configs/install
+++ b/projects/memtest86plus/configs/install
@@ -1 +1,2 @@
 memtest:memtest.elf
+memtest.bin:memtest.img
diff --git a/projects/memtest86plus/configs/revision b/projects/memtest86plus/configs/revision
index e16bc904..9f2728ba 100644
--- a/projects/memtest86plus/configs/revision
+++ b/projects/memtest86plus/configs/revision
@@ -1 +1 @@
-1fa69864d4c0aa46bb3ebd7feb966c882fb81a84
+5ca4eb9544e51254254d09ae6e70f93403469ec3
diff --git a/projects/memtest86plus/configs/targets b/projects/memtest86plus/configs/targets
deleted file mode 100644
index f2cba0e5..00000000
--- a/projects/memtest86plus/configs/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-grub
-seabios
diff --git a/projects/memtest86plus/memtest86plus b/projects/memtest86plus/memtest86plus
index 1aadbf6c..c64f66a7 100755
--- a/projects/memtest86plus/memtest86plus
+++ b/projects/memtest86plus/memtest86plus
@@ -75,7 +75,7 @@ build() {
 
 	mkdir -p "$build_path"
 	make -C "$sources_path" -j"$TASKS"
-	cp "$sources_path/memtest" "$build_path"
+	cp "$sources_path"/{memtest,memtest.bin} "$build_path"
 	make -C "$sources_path" 'clean'
 }
 
diff --git a/projects/mosys/configs/revision b/projects/mosys/configs/revision
index 79d3a325..6ce6b84b 100644
--- a/projects/mosys/configs/revision
+++ b/projects/mosys/configs/revision
@@ -1 +1 @@
-origin/release-R56-9000.B
+origin/release-R65-10323.B
diff --git a/projects/seabios/configs/revision b/projects/seabios/configs/revision
index f03e0556..3274dbdb 100644
--- a/projects/seabios/configs/revision
+++ b/projects/seabios/configs/revision
@@ -1 +1 @@
-19fdcca467ad3436d68ef88899b4dcd78154a9c6
+rel-1.11.0
diff --git a/projects/vboot/configs/revision b/projects/vboot/configs/revision
index 79d3a325..6ce6b84b 100644
--- a/projects/vboot/configs/revision
+++ b/projects/vboot/configs/revision
@@ -1 +1 @@
-origin/release-R56-9000.B
+origin/release-R65-10323.B
diff --git a/projects/vpd/configs/revision b/projects/vpd/configs/revision
index 79d3a325..6ce6b84b 100644
--- a/projects/vpd/configs/revision
+++ b/projects/vpd/configs/revision
@@ -1 +1 @@
-origin/release-R56-9000.B
+origin/release-R65-10323.B
author	KoDDoS Mirror <mirror@koddos.net>	2018-07-27 19:16:01 +0700
committer	KoDDoS Mirror <mirror@koddos.net>	2018-07-27 19:16:01 +0700
commit	4cf7c27e5dca04492495f1fc08256f57f86faf56 (patch)
tree	8128850191e6ea0cc364f17ae73e9f705ad1ecdd /projects
parent	59d7df676b7222b532c2acf4309b16d255a0808b (diff)
parent	fbe7031b606c5716b7bb87a069da05a0cf56fc12 (diff)
download	librebootfr-4cf7c27e5dca04492495f1fc08256f57f86faf56.tar.gz librebootfr-4cf7c27e5dca04492495f1fc08256f57f86faf56.zip