diff --git a/0f68b23aaf.config b/35972def1d.config
similarity index 96%
rename from 0f68b23aaf.config
rename to 35972def1d.config
index 9f85ca0..0da9de0 100644
--- a/0f68b23aaf.config
+++ b/35972def1d.config
@@ -80,6 +80,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
 # CONFIG_VENDOR_SAPPHIRE is not set
+# CONFIG_VENDOR_SCALEWAY is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
@@ -114,7 +115,7 @@ CONFIG_POST_IO=y
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_MMCONF_BASE_ADDRESS=0xf8000000
+CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_POST_DEVICE=y
 CONFIG_IFD_BIOS_SECTION=""
 CONFIG_IFD_ME_SECTION=""
@@ -281,8 +282,7 @@ CONFIG_CPU_UCODE_BINARIES=""
 # CONFIG_AMD_NB_CIMX is not set
 # CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE=y
-CONFIG_MRC_CACHE_SIZE=0x10000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE=y
 CONFIG_USE_NATIVE_RAMINIT=y
 # CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
@@ -338,6 +338,11 @@ CONFIG_IFD_PLATFORM_SECTION=""
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
 # CONFIG_UDK_2015_BINDING is not set
+# CONFIG_UDK_2017_BINDING is not set
+CONFIG_UDK_2013_VERSION=2013
+CONFIG_UDK_2015_VERSION=2015
+CONFIG_UDK_2017_VERSION=2017
+CONFIG_UDK_VERSION=2013
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -368,6 +373,7 @@ CONFIG_IFD_PLATFORM_SECTION=""
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+CONFIG_ARCH_ARMV8_EXTENSION=0
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_BOOTBLOCK_MIPS is not set
@@ -414,6 +420,8 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
+CONFIG_COLLECT_TIMESTAMPS_TSC=y
 
 #
 # Devices
@@ -461,6 +469,13 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_CACHE_MRC_SETTINGS=y
+CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
+# CONFIG_MRC_SETTINGS_PROTECT is not set
+# CONFIG_HAS_RECOVERY_MRC_CACHE is not set
+# CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN is not set
+# CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
+# CONFIG_MRC_WRITE_NV_LATE is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
@@ -497,12 +512,14 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
+# CONFIG_DRIVERS_I2C_PCA9538 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_PLATFORM_USES_FSP2_0 is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 CONFIG_INTEL_INT15=y
@@ -643,6 +660,7 @@ CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 
 #
 # Secondary Payloads