Merge branch 'master' of ssh://github.com/osresearch/heads

boards/librem13v2.config

@@ -1,5 +1,5 @@
-# Configuration for a purism13v1
+# Configuration for a librem13v2
-BOARD=purism13v1
+CONFIG_LINUX_CONFIG=config/linux-librem13v2.config
 
 CONFIG_COREBOOT=y
 CONFIG_CRYPTSETUP=y
@@ -13,11 +13,8 @@ CONFIG_PCIUTILS=y
 CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
-CONFIG_XEN=y
-CONFIG_XEN_VERSION=4.6
 
 CONFIG_LINUX_USB=y
-#CONFIG_LINUX_E1000E=y
 
 CONFIG_BOOTSCRIPT=/bin/generic-init
 

config/coreboot-librem13v2.config

@@ -7,7 +7,7 @@
 # General setup
 #
 CONFIG_COREBOOT_BUILD=y
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="4.7-Purism-1"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
@@ -24,7 +24,8 @@ CONFIG_USE_BLOBS=y
 CONFIG_RELOCATABLE_RAMSTAGE=y
 CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 # CONFIG_UPDATE_IMAGE is not set
-# CONFIG_BOOTSPLASH_IMAGE is not set
+CONFIG_BOOTSPLASH_IMAGE=y
+CONFIG_BOOTSPLASH_FILE="bootsplash.jpg"
 
 #
 # Mainboard
@@ -104,50 +105,65 @@ CONFIG_VENDOR_PURISM=y
 # 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="purism/librem_skl"
-CONFIG_MAINBOARD_DIR="purism/librem13v1"
+CONFIG_MAINBOARD_PART_NUMBER="Librem 13 v2"
-CONFIG_MAINBOARD_PART_NUMBER="Librem 13 v1"
+CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="Purism"
 CONFIG_MAX_CPUS=8
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
-CONFIG_CBFS_SIZE=0x600000
+CONFIG_CBFS_SIZE=0xe00000
-CONFIG_VGA_BIOS_ID="8086,1616"
+CONFIG_UART_FOR_CONSOLE=0
+CONFIG_VGA_BIOS_ID="8086,1916"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
-CONFIG_DIMM_SPD_SIZE=256
+CONFIG_DIMM_SPD_SIZE=512
 CONFIG_VGA_BIOS=y
-CONFIG_MAINBOARD_SERIAL_NUMBER="System Serial Number"
+CONFIG_MAINBOARD_SERIAL_NUMBER="Unknown Serial Number"
-CONFIG_DCACHE_RAM_BASE=0xff7c0000
+CONFIG_DCACHE_RAM_BASE=0xfef00000
-CONFIG_DCACHE_RAM_SIZE=0x10000
+CONFIG_DCACHE_RAM_SIZE=0x40000
-CONFIG_VGA_BIOS_FILE="3rdparty/blobs/vbios.bin"
+CONFIG_VGA_BIOS_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vgabios.bin"
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Purism"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
-CONFIG_DEVICETREE="devicetree.cb"
+# CONFIG_POST_IO is not set
+CONFIG_DEVICETREE="variants/librem13v2/devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
 # CONFIG_HAVE_GBE_BIN is not set
 CONFIG_ID_SECTION_OFFSET=0x80
+# CONFIG_POST_DEVICE is not set
+CONFIG_VARIANT_DIR="librem13v2"
 # CONFIG_VBOOT is not set
+CONFIG_MAINBOARD_FAMILY="Librem 13"
+CONFIG_TPM_PIRQ=0x0
+CONFIG_DIMM_MAX=1
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/descriptor.bin"
 CONFIG_ME_BIN_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/me.bin"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Librem 13"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Librem 13 v2"
+CONFIG_ADD_FSP_BINARIES=y
+CONFIG_FSP_M_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/fspm.bin"
+CONFIG_FSP_S_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/fsps.bin"
+CONFIG_FSP_S_CBFS="fsps.bin"
+CONFIG_FSP_M_CBFS="fspm.bin"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
-# CONFIG_USBDEBUG is not set
+CONFIG_MAINBOARD_VERSION="2.0"
-CONFIG_MAINBOARD_VERSION="1.0"
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_PS2_KEYBOARD=y
+# CONFIG_BOARD_PURISM_LIBREM13_V1 is not set
-CONFIG_BOARD_PURISM_LIBREM13_V1=y
+# CONFIG_BOARD_PURISM_LIBREM15_V2 is not set
-# CONFIG_BOARD_PURISM_LIBREM13_V2 is not set
+# CONFIG_BOARD_PURISM_LIBREM_NANO_7100 is not set
+CONFIG_BOARD_PURISM_LIBREM13_V2=y
 # CONFIG_BOARD_PURISM_LIBREM15_V3 is not set
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_NO_POST=y
+# CONFIG_NO_POST is not set
-CONFIG_PRE_GRAPHICS_DELAY=50
+# CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_KBL_NANO is not set
-# CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_SKL is not set
+CONFIG_CPU_MICROCODE_CBFS_LEN=0x18000
-CONFIG_BOARD_ROMSIZE_KB_8192=y
+CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFE115A0
+CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_SKL=y
+CONFIG_BOARD_ROMSIZE_KB_16384=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
@@ -155,14 +171,14 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
 # 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_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_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
-CONFIG_COREBOOT_ROMSIZE_KB=8192
+CONFIG_COREBOOT_ROMSIZE_KB=16384
-CONFIG_ROM_SIZE=0x800000
+CONFIG_ROM_SIZE=0x1000000
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
@@ -175,60 +191,128 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # SoC
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
-# CONFIG_S3_VGA_ROM_RUN is not set
+CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_RAMTOP=0x200000
-CONFIG_HEAP_SIZE=0x4000
+CONFIG_HEAP_SIZE=0x80000
 CONFIG_RAMBASE=0x100000
-CONFIG_EHCI_BAR=0xd8000000
 CONFIG_SERIRQ_CONTINUOUS_MODE=y
 CONFIG_SMM_TSEG_SIZE=0x800000
-CONFIG_SMM_RESERVED_SIZE=0x100000
+CONFIG_SMM_RESERVED_SIZE=0x200000
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
-CONFIG_BOOTBLOCK_CPU_INIT="soc/intel/broadwell/bootblock/cpu.c"
 # CONFIG_SOC_INTEL_GLK is not set
-# CONFIG_SOC_INTEL_COMMON_RESET is not set
+CONFIG_SOC_INTEL_COMMON_RESET=y
-CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_PCR_BASE_ADDRESS=0xfd000000
+CONFIG_SOC_INTEL_COMMON_LPSS_CLOCK_MHZ=120
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0xC000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
-CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+# CONFIG_NHLT_MAX98357 is not set
-CONFIG_HAVE_MRC=y
+# CONFIG_NHLT_DA7219 is not set
-CONFIG_MRC_FILE="3rdparty/blobs/mrc.bin"
+# CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
-CONFIG_MRC_BIN_ADDRESS=0xfffa0000
+CONFIG_CPU_BCLK_MHZ=100
-CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
+CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
+CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
 # CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE is not set
-CONFIG_HAVE_REFCODE_BLOB=y
+CONFIG_CHIPSET_BOOTBLOCK_INCLUDE="soc/intel/skylake/bootblock/timestamp.inc"
-CONFIG_REFCODE_BLOB_FILE="3rdparty/blobs/refcode.elf"
-CONFIG_CHIPSET_BOOTBLOCK_INCLUDE="soc/intel/broadwell/bootblock/timestamp.inc"
-# CONFIG_BUILD_WITH_FAKE_IFD is not set
 CONFIG_IED_REGION_SIZE=0x400000
-CONFIG_SOC_INTEL_BROADWELL=y
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
-CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="soc/intel/broadwell/bootblock/systemagent.c"
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="soc/intel/broadwell/bootblock/pch.c"
 # CONFIG_SERIAL_CPU_INIT is not set
-CONFIG_CACHE_MRC_SIZE_KB=512
+# CONFIG_UART_DEBUG is not set
-# CONFIG_INTEL_PCH_UART_CONSOLE is not set
+CONFIG_MAX_ROOT_PORTS=24
+CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX=2
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
+CONFIG_SOC_INTEL_SKYLAKE=y
 # CONFIG_SOC_INTEL_KABYLAKE is not set
+CONFIG_MAINBOARD_USES_FSP2_0=y
+CONFIG_USE_FSP2_0_DRIVER=y
+CONFIG_BOOTBLOCK_RESETS="soc/intel/common/reset.c"
+# CONFIG_EXCLUDE_NATIVE_SD_INTERFACE is not set
+# CONFIG_SKYLAKE_SOC_PCH_H is not set
+# CONFIG_NHLT_DMIC_2CH is not set
+# CONFIG_NHLT_DMIC_4CH is not set
+# CONFIG_NHLT_NAU88L25 is not set
+# CONFIG_NHLT_SSM4567 is not set
+# CONFIG_NHLT_RT5514 is not set
+# CONFIG_NHLT_RT5663 is not set
+# CONFIG_NHLT_MAX98927 is not set
+CONFIG_CAR_NEM_ENHANCED=y
+# CONFIG_USE_SKYLAKE_FSP_CAR is not set
+CONFIG_SKIP_FSP_CAR=y
+# CONFIG_NO_FADT_8042 is not set
 CONFIG_SOC_INTEL_COMMON=y
 
 #
 # Intel SoC Common Code
 #
+CONFIG_SOC_INTEL_COMMON_BLOCK=y
+
+#
+# Intel SoC Common IP Code
+#
+CONFIG_SOC_INTEL_COMMON_BLOCK_CPU=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y
+# CONFIG_INTEL_CAR_NEM is not set
+# CONFIG_INTEL_CAR_CQOS is not set
+CONFIG_INTEL_CAR_NEM_ENHANCED=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_EBDA=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
+CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
+# CONFIG_DEBUG_SOC_COMMON_BLOCK_GPIO is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_PADCFG_PADTOL=y
+# CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_IOSTANDBY is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS=y
+# CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
+# CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y
+# CONFIG_SOC_INTEL_COMMON_BLOCK_I2C_DEBUG is not set
+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_PCIE=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
+# CONFIG_POWER_STATE_OFF_AFTER_FAILURE is not set
+CONFIG_POWER_STATE_ON_AFTER_FAILURE=y
+# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SGX=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
+CONFIG_SA_PCIEX_LENGTH=0x4000000
+CONFIG_PCIEX_LENGTH_64MB=y
+# CONFIG_SA_ENABLE_IMR is not set
+CONFIG_SA_ENABLE_DPR=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 # CONFIG_DISPLAY_MTRRS is not set
 # CONFIG_DISPLAY_SMM_MEMORY_MAP is not set
 CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE=y
 # CONFIG_ACPI_CONSOLE is not set
-# CONFIG_SOC_INTEL_COMMON_GFX_OPREGION is not set
+# CONFIG_MMA is not set
+CONFIG_SOC_INTEL_COMMON_GFX_OPREGION=y
 # CONFIG_SOC_INTEL_COMMON_SMI is not set
 # CONFIG_SOC_INTEL_COMMON_ACPI is not set
-# CONFIG_SOC_INTEL_COMMON_NHLT is not set
+CONFIG_SOC_INTEL_COMMON_NHLT=y
 # CONFIG_SOC_LOWRISC_LOWRISC is not set
 # CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
@@ -246,7 +330,6 @@ CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE=y
 # CPU
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
-CONFIG_XIP_ROM_SIZE=0x10000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
@@ -255,22 +338,19 @@ CONFIG_SSE2=y
 CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=4
 # 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=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
+CONFIG_PARALLEL_MP_AP_WORK=y
 # CONFIG_UDELAY_IO is not set
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
 CONFIG_TSC_CONSTANT_RATE=y
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TIMER2 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_NO_FIXED_XIP_ROM_SIZE=y
 CONFIG_LOGICAL_CPUS=y
 CONFIG_SMM_TSEG=y
 CONFIG_SMM_MODULE_HEAP_SIZE=0x4000
@@ -281,7 +361,7 @@ CONFIG_SMM_MODULE_HEAP_SIZE=0x4000
 # 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_NO_CAR_GLOBAL_MIGRATION=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_SSE=y
@@ -291,7 +371,7 @@ CONFIG_CPU_MICROCODE_CBFS_GENERATE=y
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 # CONFIG_CPU_MICROCODE_CBFS_NONE is not set
 # CONFIG_CPU_MICROCODE_MULTIPLE_FILES is not set
-CONFIG_CPU_UCODE_BINARIES=""
+CONFIG_CPU_UCODE_BINARIES="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/cpu_microcode_blob.bin"
 
 #
 # Northbridge
@@ -328,20 +408,19 @@ CONFIG_MAX_PIRQ_LINKS=4
 #
 # Embedded Controllers
 #
-CONFIG_EC_PURISM_LIBREM=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
 
 #
 # Intel Firmware
 #
 # CONFIG_EM100 is not set
-CONFIG_CHECK_ME=y
+# CONFIG_CHECK_ME is not set
 # CONFIG_USE_ME_CLEANER 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_UDK_2015_BINDING=y
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -403,13 +482,13 @@ CONFIG_ARCH_RAMSTAGE_X86_32=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_EARLY_EBDA_INIT=y
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_POSTCAR_STAGE is not set
+CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
@@ -419,55 +498,20 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # Devices
 #
-CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
+CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-CONFIG_HAVE_VBE_LINEAR_FRAMEBUFFER=y
+CONFIG_HAVE_FSP_GOP=y
 # CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
 # CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
-CONFIG_VGA_ROM_RUN=y
+CONFIG_RUN_FSP_GOP=y
+# CONFIG_VGA_ROM_RUN is not set
 # CONFIG_NO_GFX_INIT is not set
-# CONFIG_ALWAYS_LOAD_OPROM is not set
-# CONFIG_ON_DEVICE_ROM_LOAD is not set
-CONFIG_PCI_OPTION_ROM_RUN_REALMODE=y
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 
 #
 # Display
 #
-CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
-# CONFIG_FRAMEBUFFER_VESA_MODE_100 is not set
+CONFIG_LINEAR_FRAMEBUFFER=y
-# CONFIG_FRAMEBUFFER_VESA_MODE_101 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_102 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_103 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_104 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_105 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_106 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_107 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_108 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_109 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10A is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10B is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10C is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10D is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10E is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_10F is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_110 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_111 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_112 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_113 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_114 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_115 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_116 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_117 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_118 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_119 is not set
-# CONFIG_FRAMEBUFFER_VESA_MODE_11A is not set
-CONFIG_FRAMEBUFFER_VESA_MODE_11B=y
-# CONFIG_FRAMEBUFFER_VESA_MODE_USER is not set
-CONFIG_FRAMEBUFFER_VESA_MODE=0x11B
-# CONFIG_BOOTSPLASH is not set
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
-# CONFIG_VBE_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 CONFIG_PCI=y
 CONFIG_MMCONF_SUPPORT=y
@@ -479,7 +523,8 @@ CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
-# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
+CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE=y
+CONFIG_INTEL_GMA_VBT_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vbt.bin"
 # CONFIG_SOFTWARE_I2C is not set
 
 #
@@ -501,22 +546,12 @@ CONFIG_MRC_SETTINGS_PROTECT=y
 # 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_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
 # 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=y
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVERS_UART is not set
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
@@ -527,10 +562,12 @@ CONFIG_HAVE_SPI_CONSOLE_SUPPORT=y
 # 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 is not set
 # 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_DESIGNWARE=y
+# CONFIG_DRIVERS_I2C_DESIGNWARE_DEBUG is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RT5663 is not set
@@ -538,6 +575,16 @@ CONFIG_HAVE_USBDEBUG=y
 # 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_DISPLAY_HOBS is not set
+# CONFIG_DISPLAY_UPD_DATA is not set
+CONFIG_CHECKLIST_DATA_FILE_LOCATION="src/vendorcode/intel/fsp/fsp2_0/checklist"
+CONFIG_PLATFORM_USES_FSP2_0=y
+CONFIG_DISPLAY_FSP_CALLS_AND_STATUS=y
+# CONFIG_DISPLAY_FSP_HEADER is not set
+# CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
+# CONFIG_VERIFY_HOBS is not set
+# CONFIG_FSP2_0_USES_TPM_MRC_HASH is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 CONFIG_INTEL_INT15=y
@@ -552,7 +599,12 @@ CONFIG_INTEL_INT15=y
 # 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=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+# CONFIG_TPM_INIT_FAILURE_IS_FATAL is not set
+# CONFIG_SKIP_TPM_STARTUP_ON_NORMAL_BOOT is not set
+# CONFIG_TPM_DEACTIVATE is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
@@ -585,13 +637,15 @@ CONFIG_RTC=y
 #
 # Console
 #
+CONFIG_BOOTBLOCK_CONSOLE=y
+CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # 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_CONSOLE_SPI_FLASH=y
-# CONFIG_SPI_CONSOLE is not set
+CONFIG_CONSOLE_SPI_FLASH_BUFFER_SIZE=0x20000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -601,6 +655,8 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # 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_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
@@ -621,8 +677,8 @@ CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
-# CONFIG_COMMON_FADT is not set
+CONFIG_COMMON_FADT=y
-# CONFIG_ACPI_NHLT is not set
+CONFIG_ACPI_NHLT=y
 
 #
 # System tables
@@ -643,17 +699,17 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_PAYLOAD_UBOOT is not set
 CONFIG_PAYLOAD_LINUX=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="bzImage"
+CONFIG_PAYLOAD_FILE="payloads/heads/bzImage"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
-CONFIG_LINUX_COMMAND_LINE=""
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off"
-CONFIG_LINUX_INITRD="./initrd.cpio.xz"
+CONFIG_LINUX_INITRD="payloads/heads/initrd.cpio.xz"
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 
 #
 # Secondary Payloads
 #
-# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+CONFIG_COREINFO_SECONDARY_PAYLOAD=y
 CONFIG_MEMTEST_SECONDARY_PAYLOAD=y
 CONFIG_MEMTEST_STABLE=y
 # CONFIG_MEMTEST_MASTER is not set
@@ -672,7 +728,6 @@ CONFIG_MEMTEST_STABLE=y
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
-# CONFIG_REALMODE_DEBUG is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
@@ -692,4 +747,6 @@ CONFIG_REG_SCRIPT=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
-CONFIG_BOOTBLOCK_CUSTOM=y
+CONFIG_GENERIC_GPIO_LIB=y
+CONFIG_SPD_READ_BY_WORD=y
+CONFIG_C_ENVIRONMENT_BOOTBLOCK=y