diff --git a/coreboot b/coreboot
index 419d239..45535e4 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 419d23908a55bbee61e8a18d57b696b179028610
+Subproject commit 45535e4a0555f26f000c9908a86bdf8f74aab952
diff --git a/models/lemp9/coreboot.config b/models/lemp9/coreboot.config
index 7c0401e..ba21cda 100644
--- a/models/lemp9/coreboot.config
+++ b/models/lemp9/coreboot.config
@@ -36,6 +36,7 @@ CONFIG_TSEG_STAGE_CACHE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
+# CONFIG_VENDOR_51NB is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
@@ -60,12 +61,15 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO is not set
+# CONFIG_VENDOR_LIBRETREND is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_MSI is not set
+# CONFIG_VENDOR_OCP is not set
 # CONFIG_VENDOR_OPENCELLULAR is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
 # CONFIG_VENDOR_PORTWELL is not set
+# CONFIG_VENDOR_PROTECTLI is not set
 # CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RAZER is not set
 # CONFIG_VENDOR_RODA is not set
@@ -78,16 +82,19 @@ CONFIG_TSEG_STAGE_CACHE=y
 CONFIG_VENDOR_SYSTEM76=y
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_UP is not set
-CONFIG_MAINBOARD_VENDOR="System76"
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="system76/lemp9"
 CONFIG_MAINBOARD_PART_NUMBER="lemp9"
+CONFIG_MAINBOARD_VERSION="lemp9"
+CONFIG_MAINBOARD_DIR="system76/lemp9"
 CONFIG_MAX_CPUS=8
-CONFIG_ONBOARD_VGA_IS_PRIMARY=y
-CONFIG_DIMM_SPD_SIZE=512
-# CONFIG_VGA_BIOS is not set
 CONFIG_VGA_BIOS_ID="8086,9b41"
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+CONFIG_DIMM_MAX=2
+CONFIG_DIMM_SPD_SIZE=512
+CONFIG_FMDFILE=""
+# CONFIG_NO_POST is not set
+CONFIG_MAINBOARD_VENDOR="System76"
+CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+# CONFIG_VGA_BIOS is not set
 CONFIG_VGA_BIOS_FILE="pci8086,9b41.rom"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0xC000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="System76"
@@ -99,12 +106,12 @@ CONFIG_CBFS_SIZE=0xA00000
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_UART_FOR_CONSOLE=2
-CONFIG_FMDFILE=""
 # CONFIG_VBOOT is not set
 CONFIG_DCACHE_RAM_BASE=0xfef00000
 CONFIG_DCACHE_RAM_SIZE=0x40000
 CONFIG_DCACHE_BSP_STACK_SIZE=0x20400
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
@@ -112,20 +119,19 @@ CONFIG_TPM_INIT=y
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
-CONFIG_DIMM_MAX=2
-CONFIG_TPM_PIRQ=0x1F
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_TPM_PIRQ=0x0
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Lemur Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
-CONFIG_FSP_M_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/FSP/Fsp_M.fd"
-CONFIG_FSP_S_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/FSP/Fsp_S.fd"
+CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd"
+CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd"
 CONFIG_FSP_S_CBFS="fsps.bin"
 CONFIG_FSP_M_CBFS="fspm.bin"
-CONFIG_MAINBOARD_VERSION="lemp9"
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_PS2K_EISAID="PNP0303"
+CONFIG_PS2M_EISAID="PNP0F13"
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_PCIEXP_L1_SUB_STATE=y
-# CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_CONSOLE_POST=y
@@ -163,7 +169,7 @@ 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_ROM_SIZE=0x01000000
 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
 CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
 CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
@@ -185,14 +191,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # SoC
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
-CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe032000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
 CONFIG_SMM_MODULE_STACK_SIZE=0x800
-CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=216
+CONFIG_X86_RESET_VECTOR=0xfffffff0
+CONFIG_FSP_TEMP_RAM_SIZE=0x10000
 # CONFIG_SOC_CAVIUM_CN81XX is not set
 CONFIG_ARCH_ARMV8_EXTENSION=0
 CONFIG_STACK_SIZE=0x1000
@@ -203,7 +210,8 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
-CONFIG_FSP_HEADER_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/FSP/Include/"
+CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
+CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
 # CONFIG_NHLT_DMIC_1CH_16B is not set
 # CONFIG_NHLT_DMIC_2CH_16B is not set
 # CONFIG_NHLT_DMIC_4CH_16B is not set
@@ -222,7 +230,6 @@ CONFIG_IED_REGION_SIZE=0x400000
 CONFIG_SOC_INTEL_CANNONLAKE_BASE=y
 CONFIG_SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS=y
 CONFIG_SOC_INTEL_COMETLAKE=y
-CONFIG_FSP_TEMP_RAM_SIZE=0x10000
 # CONFIG_NHLT_MAX98373 is not set
 CONFIG_MAX_ROOT_PORTS=16
 CONFIG_MAX_PCIE_CLOCKS=6
@@ -233,6 +240,7 @@ CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
+CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON=y
 
 #
@@ -260,7 +268,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
-# CONFIG_SKIP_GRAPHICS_ENABLING is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -270,7 +277,6 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y
-CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
@@ -296,6 +302,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
 # CONFIG_HECI_DISABLE_USING_SMM is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
@@ -367,7 +374,8 @@ CONFIG_UDELAY_TSC=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
-CONFIG_NO_FIXED_XIP_ROM_SIZE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
+CONFIG_XIP_ROM_SIZE=0x10000
 CONFIG_LOGICAL_CPUS=y
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_NO_SMM is not set
@@ -379,14 +387,13 @@ CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
 CONFIG_SMP=y
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
-CONFIG_MICROCODE_BLOB_UNDISCLOSED=y
 CONFIG_USE_CPU_MICROCODE_CBFS_BINS=y
+# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
 CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
@@ -397,6 +404,8 @@ CONFIG_CPU_UCODE_BINARIES="$(FIRMWARE_OPEN_MODEL_DIR)/microcode.rom"
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
+CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 
 #
 # Southbridge
@@ -433,6 +442,8 @@ CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
+# CONFIG_EC_51NB_NPCE985LA0DX is not set
+# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
 # CONFIG_EC_GOOGLE_WILCO is not set
 
 #
@@ -465,7 +476,6 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_POSTCAR_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
-CONFIG_X86_RESET_VECTOR=0xfffffff0
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
@@ -483,7 +493,6 @@ CONFIG_POSTCAR_STAGE=y
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_ACPI_HAVE_PCAT_8259=y
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
@@ -521,6 +530,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_HOTPLUG is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
@@ -538,10 +548,10 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
 # 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_SUPPORT_LEGACY_VPD_MAC is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SMMSTORE=y
 # CONFIG_SMMSTORE_IN_CBFS is not set
@@ -573,7 +583,7 @@ CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
-# CONFIG_DRIVERS_GENERIC_GFX is not set
+# CONFIG_DRIVERS_GFX_GENERIC is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_DESIGNWARE_DEBUG is not set
 CONFIG_DRIVERS_I2C_GENERIC=y
@@ -591,12 +601,14 @@ CONFIG_DRIVERS_I2C_HID=y
 # CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
+CONFIG_FSP_USE_REPO=y
 # CONFIG_DISPLAY_HOBS is not set
 # CONFIG_DISPLAY_UPD_DATA is not set
 CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
+CONFIG_HAVE_INTEL_FSP_REPO=y
 CONFIG_FSP_T_CBFS="fspt.bin"
-CONFIG_FSP_T_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/FSP/Fsp_T.fd"
+CONFIG_FSP_T_FILE="$(obj)/Fsp_T.fd"
 CONFIG_FSP_CAR=y
 CONFIG_FSP_T_XIP=y
 CONFIG_FSP_USES_CB_STACK=y
@@ -606,15 +618,19 @@ CONFIG_HAVE_FSP_LOGO_SUPPORT=y
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_BCLV_WIDTH=16
+CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_INTEL_GMA_SWSMISCI is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_ISH is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
 # CONFIG_HAVE_INTEL_PTT 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_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
 CONFIG_LPC_TPM=y
 CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -624,8 +640,8 @@ CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # 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_MAINBOARD_HAS_SPI_TPM 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_USB_ACPI is not set
 # CONFIG_COMMONLIB_STORAGE is not set
@@ -645,6 +661,7 @@ CONFIG_TPM2=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
+# CONFIG_TPM_MEASURED_BOOT is not set
 
 #
 # Memory initialization
@@ -652,9 +669,14 @@ CONFIG_MAINBOARD_HAS_TPM2=y
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
 # CONFIG_INTEL_TXT is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
-CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_STM is not set
+CONFIG_BOOTMEDIA_LOCK_NONE=y
+# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
+# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
@@ -667,7 +689,6 @@ CONFIG_RTC=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_FIXED_UART_FOR_CONSOLE=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
@@ -700,7 +721,6 @@ CONFIG_HAVE_MONOTONIC_TIMER=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
 # CONFIG_GFXUMA is not set
-CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
 CONFIG_ACPI_NHLT=y
 
@@ -711,6 +731,7 @@ CONFIG_ACPI_NHLT=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 
 #
 # Payload
@@ -728,6 +749,7 @@ CONFIG_PAYLOAD_ELF=y
 CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
+# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
@@ -738,7 +760,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=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
 
 #
@@ -762,6 +783,7 @@ CONFIG_DISPLAY_FSP_VERSION_INFO=y
 #
 # General Debug Settings
 #
+# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 CONFIG_HAVE_DEBUG_GPIO=y
 # CONFIG_DEBUG_GPIO is not set
@@ -793,5 +815,6 @@ CONFIG_MAX_REBOOT_CNT=3
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
+CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y