Update to 4.7-Purism-2 for librem 13 v1

e7fe3d87 · Youness Alaoui · cdd4da12 · e7fe3d87 · e7fe3d87 · e7fe3d87
Commit e7fe3d87 authored Feb 26, 2018 by Youness Alaoui
--- a/Changelog.txt
+++ b/Changelog.txt
 Librem 15 v3 :
 ==================================================

+4.7-Purism-2
+===
+- Nothing (Bump version number to match librem 13 v1 release)
+
 4.7-Purism-1
 ===
 - Update to coreboot 4.7
@@ -34,6 +38,10 @@ Librem 15 v3 :
 Librem 13 v2 :
 ==================================================

+4.7-Purism-2
+===
+- Nothing (Bump version number to match librem 13 v1 release)
+
 4.7-Purism-1
 ===
 - Update to coreboot 4.7
@@ -63,3 +71,19 @@ Librem 13 v2 :
 4.6-a86d1b-Purism-1
 ====
 - Initial Librem 13 v2 coreboot port
+
+Librem 13 v1 :
+==================================================
+
+4.7-Purism-2
+===
+- Update to coreboot 4.7
+- Fix AER issues with PCIe 
+- Fix NVME sleep issues
+- Fix battery status reporting issue
+- Add IOMMU support
+
+4.6-a86d1b-Purism-2
+===
+- Initial Librem 13 v1 coreboot port
+
--- a/build_coreboot.sh
+++ b/build_coreboot.sh
@@ -2,11 +2,14 @@
 # depends on : git build-essential bison flex m4 zlib1g-dev gnat libpci-dev libusb-dev libusb-1.0-0-dev dmidecode bsdiff python2.7

 # Librem 13 v1 binary blob hashes
+BDL_UCODE_SHA="69537c27d152ada7dce9e35bfa16e3cede81a18428d1011bd3c33ecae7afb467"
 BDL_DESCRIPTOR_SHA="be34b19b4de387a07d4fc859d2e4ee44723756f5f54552f236136679b4e52c46"
 BDL_MRC_SHA="dd05ab481e1fe0ce20ade164cf3dbef3c479592801470e6e79faa17624751343"
 BDL_REFCODE_SHA="8a919ffece61ba21664b1028b0ebbfabcd727d90c1ae2f72b48152b8774323a4"
 BDL_VBIOS_SHA="e1cd1b4f2bd21e036145856e2d092eb47c27cdb4b717c3b182a18d8c0b1d0f01"

+BDL_UCODE_URL="https://github.com/platomav/CPUMicrocodes/raw/master/Intel/cpu306D4_platC0_ver0000002A_2018-01-18_PRD_CC79BBDA.bin"
+
 # Librem 13 v2 and Librem 15 v3 binary blob hashes
 SKL_UCODE_SHA="9c84936df700d74612a99e6ab581640ecf423d25a0b74a1ea23a6d9872349213"
 SKL_DESCRIPTOR_SHA="d5110807c9d67cea6d546ac62125d87042a868177241be4ae17a2dbedef10017"
@@ -36,16 +39,16 @@ SKL_ME_RAR_SHA="7ce1a75be975cd86c860dde2f114d0a8f7c35802e8bc6623d9ab1dbe285e8954
 RAR_NONFREE_SOURCE_URL="https://www.rarlab.com/rar/unrarsrc-5.5.8.tar.gz"
 RAR_NONFREE_SOURCE_SHA="9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4"

-BDL_COREBOOT_BRANCH="librem13v2_sata_fix"
+BDL_COREBOOT_BRANCH="librem_4.7"
 SKL_COREBOOT_BRANCH="librem_4.7"

 # Final flashregion_1_bios sha256 hashes
-L13V1_COREBOOT_BIOS_SHA="9f75e3b24353cbae88f05ab4900382ed2f928e3c3a661a9250fce7a49874ed11"
-L13V1_COREBOOT_VERSION="4.6-a86d1b-Purism-2"
-L13V2_COREBOOT_BIOS_SHA="fe12dad83bfa76d56191db5a5091df9e07884aff0dc93e5b3a69ede4f2f4c199"
-L13V2_COREBOOT_VERSION="4.7-Purism-1"
-L15V3_COREBOOT_BIOS_SHA="274d690b67d84e2ddbdf71523661ba4486e35e88250995094cf248b2939a37b6"
-L15V3_COREBOOT_VERSION="4.7-Purism-1"
+L13V1_COREBOOT_BIOS_SHA="304d1b66a66a6aa7baed90987e52653f5d50ab82c4ee1d974b4a0c4236532e77"
+L13V1_COREBOOT_VERSION="4.7-Purism-2"
+L13V2_COREBOOT_BIOS_SHA="c916c08859d1d68e0ef99d4eb99a5cbcffb8ac9541797e4918eb737b12fcb396"
+L13V2_COREBOOT_VERSION="4.7-Purism-2"
+L15V3_COREBOOT_BIOS_SHA="f123795cbeb0e0e04089dbf4e9b92bbf705dc6ad10cd0585036d3c44c83c8c09"
+L15V3_COREBOOT_VERSION="4.7-Purism-2"


 die () {
@@ -91,6 +94,25 @@ check_binary () {
    fi
 }

+check_and_get_url () {
+    filename=$1
+    url=$2
+    hash=$3
+    description=$4
+
+    if [ -f "$BLOB_DIR/$filename" ]; then
+        sha=$(sha256sum "$BLOB_DIR/$filename" | awk '{print $1}')
+    fi
+    if [ "$sha" != "$hash" ]; then
+        wget -O "$BLOB_DIR/$filename" "$url"
+        sha=$(sha256sum "$BLOB_DIR/$filename" | awk '{print $1}')
+        if [ "$sha" != "$hash" ]; then
+            die "Downloaded $description has the wrong SHA256 hash"
+        fi
+    fi
+    
+}
+
 check_and_copy_descriptor_bdl () {
    if [ -f "$BLOB_DIR/descriptor.bin" ]; then
        sha=$(sha256sum "$BLOB_DIR/descriptor.bin" | awk '{print $1}')
@@ -117,33 +139,6 @@ check_and_copy_descriptor_skl () {
    fi
 }

-check_and_get_vbt () {
-    if [ -f "$BLOB_DIR/vbt.bin" ]; then
-        sha=$(sha256sum "$BLOB_DIR/vbt.bin" | awk '{print $1}')
-    fi
-    if [ "$sha" != "$SKL_VBT_SHA" ]; then
-        wget -O "$BLOB_DIR/vbt.bin" "$SKL_VBT_URL"
-        sha=$(sha256sum "$BLOB_DIR/vbt.bin" | awk '{print $1}')
-        if [ "$sha" != "$SKL_VBT_SHA" ]; then
-            die "Downloaded VBT file has the wrong SHA256 hash"
-        fi
-    fi
-}
-
-
-check_and_get_skl_microcode () {
-    if [ -f "$BLOB_DIR/cpu_microcode_blob.bin" ]; then
-        sha=$(sha256sum "$BLOB_DIR/cpu_microcode_blob.bin" | awk '{print $1}')
-    fi
-    if [ "$sha" != "$SKL_UCODE_SHA" ]; then
-        wget -O "$BLOB_DIR/cpu_microcode_blob.bin" "$SKL_UCODE_URL"
-        sha=$(sha256sum "$BLOB_DIR/cpu_microcode_blob.bin" | awk '{print $1}')
-        if [ "$sha" != "$SKL_UCODE_SHA" ]; then
-            die "Downloaded Intel Microcode Update file has the wrong SHA256 hash"
-        fi
-    fi
-}
-
 get_and_split_fsp () {
    fsp="fsp.fd"
    fsp_M="fsp_M.fd"
@@ -408,6 +403,7 @@ echo "me.bin                 - The Intel Management Engine image  - File content
 echo "mrc.bin                - The Memory Reference Code          - SHA256: $BDL_MRC_SHA"
 echo "refcode.elf            - The PCH Reference Code             - SHA256: $BDL_REFCODE_SHA"
 echo "vgabios.bin            - The VGA BIOS                       - SHA256: $BDL_VBIOS_SHA"
+echo "cpu_microcode_blob.bin - The CPU Microcode Update           - SHA256: $BDL_UCODE_SHA"
 echo ""
 else
 echo "descriptor.bin         - The Intel Descriptor               - SHA256: $SKL_DESCRIPTOR_SHA"
@@ -487,6 +483,7 @@ if [ "$blobs" == "1" ] || [ "$blobs" == "2" ]; then
        # TODO : Make sure ME image has the right version for Broadwell (10.x)
        mv flashregion_2_intel_me.bin $BLOB_DIR/me.bin
        check_and_copy_descriptor_bdl
+        check_and_get_url cpu_microcode_blob.bin $BDL_UCODE_URL $BDL_UCODE_SHA "Intel Microcode Update"
        extract_binary mrc.bin mrc.bin $BDL_MRC_SHA
        extract_binary "fallback/refcode" refcode.elf $BDL_REFCODE_SHA
        extract_binary pci8086,1616.rom vgabios.bin $BDL_VBIOS_SHA
@@ -498,10 +495,8 @@ if [ "$blobs" == "1" ] || [ "$blobs" == "2" ]; then
        get_and_split_fsp
        check_binary fspm.bin $SKL_FSPM_SHA
        check_binary fsps.bin $SKL_FSPS_SHA
-        check_and_get_vbt
-        check_binary vbt.bin $SKL_VBT_SHA
-        check_and_get_skl_microcode
-        check_binary cpu_microcode_blob.bin $SKL_UCODE_SHA
+        check_and_get_url vbt.bin $SKL_VBT_URL $SKL_VBT_SHA "Video BIOS Table"
+        check_and_get_url cpu_microcode_blob.bin $SKL_UCODE_URL $SKL_UCODE_SHA "Intel Microcode Update"
        extract_binary pci8086,1916.rom vgabios.bin $SKL_VBIOS_SHA
        if [ -f $BLOB_DIR/cpu_microcode_blob.bin ]; then
            sha=$(sha256sum $BLOB_DIR/cpu_microcode_blob.bin | awk '{print $1}')
@@ -517,6 +512,7 @@ else
        check_binary mrc.bin $BDL_MRC_SHA
        check_binary refcode.elf $BDL_REFCODE_SHA
        check_binary vgabios.bin $BDL_VBIOS_SHA
+        check_and_get_url cpu_microcode_blob.bin $BDL_UCODE_URL $BDL_UCODE_SHA "Intel Microcode Update"
    else
        check_and_copy_descriptor_skl
        check_binary descriptor.bin $SKL_DESCRIPTOR_SHA
@@ -606,10 +602,20 @@ update_crossgcc_toolchain

 make clean
 make
+
+if [ $SKL -eq 0 ]; then
+    # Unfortunately, we need to remove and replace the microcode file manually because
+    # coreboot just concatenates it to the old image, which makes it get ignored by the CPU
+    ./util/cbfstool/cbfstool build/coreboot.rom remove -n cpu_microcode_blob.bin
+    ./util/cbfstool/cbfstool build/coreboot.rom add -n cpu_microcode_blob.bin -f "$BLOB_DIR/cpu_microcode_blob.bin" \
+                             -t microcode -r COREBOOT -a 16 
+fi
+
+
 ./util/ifdtool/ifdtool -x build/coreboot.rom
 sha=$(sha256sum flashregion_1_bios.bin | awk '{print $1}')
 if [ -f serial_number.txt ]; then
-    ./util/cbfstool/cbfstool build/coreboot.rom add -n serial_number -t raw -f serial_number.txt
+    ./util/cbfstool/cbfstool build/coreboot.rom add -n serial_number -t raw -f serial_number.txt -r COREBOOT
 fi

 if [ ! -d me_cleaner ]; then

--- a/configs/config.librem13v1
+++ b/configs/config.librem13v1
@@ -7,7 +7,7 @@
 # General setup
 #
 CONFIG_COREBOOT_BUILD=y
-CONFIG_LOCALVERSION="4.6-a86d1b-Purism-2"
+CONFIG_LOCALVERSION="4.7-Purism-2"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
@@ -51,10 +51,10 @@ CONFIG_BOOTSPLASH_FILE="bootsplash.jpg"
 # 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
@@ -103,6 +103,7 @@ CONFIG_VENDOR_PURISM=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="purism/librem13v1"
@@ -126,16 +127,17 @@ CONFIG_HAVE_ME_BIN=y
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_ID_SECTION_OFFSET=0x80
+# CONFIG_HAVE_GBE_BIN is not set
 CONFIG_USBDEBUG_HCD_INDEX=0
+CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_VBOOT is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
+CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 # CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_FMDFILE=""
 CONFIG_IFD_BIN_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/descriptor.bin"
 CONFIG_ME_BIN_PATH="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/me.bin"
-# CONFIG_HAVE_GBE_BIN is not set
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Librem 13"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -145,8 +147,10 @@ CONFIG_BOARD_PURISM_LIBREM13_V1=y
 # CONFIG_BOARD_PURISM_LIBREM13_V2 is not set
 # CONFIG_BOARD_PURISM_LIBREM15_V3 is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
+# CONFIG_PCIEXP_AER is not set
 CONFIG_NO_POST=y
 CONFIG_PRE_GRAPHICS_DELAY=50
+# CONFIG_BOARD_PURISM_BASEBOARD_LIBREM_SKL is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -156,6 +160,7 @@ 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
@@ -173,20 +178,24 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # SoC
 #
+CONFIG_CPU_SPECIFIC_OPTIONS=y
+CONFIG_RAMTOP=0x200000
+CONFIG_HEAP_SIZE=0x4000
+CONFIG_RAMBASE=0x100000
+CONFIG_EHCI_BAR=0xd8000000
+CONFIG_SERIRQ_CONTINUOUS_MODE=y
+CONFIG_SMM_TSEG_SIZE=0x800000
+CONFIG_SMM_RESERVED_SIZE=0x100000
+CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_BOOTBLOCK_CPU_INIT="soc/intel/broadwell/bootblock/cpu.c"
-CONFIG_CPU_SPECIFIC_OPTIONS=y
+# CONFIG_SOC_INTEL_GLK is not set
 # CONFIG_SOC_INTEL_COMMON_RESET is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
-CONFIG_CACHE_MRC_SETTINGS=y
-# CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
-CONFIG_HEAP_SIZE=0x4000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
-CONFIG_SMM_RESERVED_SIZE=0x100000
-CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_HAVE_MRC=y
 CONFIG_MRC_FILE="3rdparty/blobs/mainboard/$(MAINBOARDDIR)/mrc.bin"
 CONFIG_MRC_BIN_ADDRESS=0xfffa0000
@@ -206,34 +215,23 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="soc/intel/broadwell/bootblock/pch.c"
 # CONFIG_SERIAL_CPU_INIT is not set
 CONFIG_CACHE_MRC_SIZE_KB=512
 # CONFIG_INTEL_PCH_UART_CONSOLE is not set
-CONFIG_EHCI_BAR=0xd8000000
-CONFIG_EHCI_DEBUG_OFFSET=0xa0
-CONFIG_SERIRQ_CONTINUOUS_MODE=y
+CONFIG_STACK_SIZE=0x1000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+# CONFIG_SOC_INTEL_KABYLAKE is not set
 CONFIG_SOC_INTEL_COMMON=y

 #
 # Intel SoC Common Code
 #
-# CONFIG_SOC_INTEL_COMMON_SPI_FLASH_PROTECT is not set
-CONFIG_MRC_SETTINGS_CACHE_BASE=0xfffe0000
-CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
-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_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_LPSS_I2C is not set
-# CONFIG_ADD_VBT_DATA_FILE is not set
 # CONFIG_SOC_INTEL_COMMON_GFX_OPREGION is not set
 # 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_RAMTOP=0x200000
-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
@@ -289,13 +287,14 @@ CONFIG_CACHE_AS_RAM=y
 # CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
+CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
 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
@@ -305,9 +304,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_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
-# CONFIG_NORTHBRIDGE_INTEL_COMMON_GMA_OPREGION is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_MAX_PIRQ_LINKS=4

@@ -319,6 +316,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_LOCK_MANAGEMENT_ENGINE is not set

 #
@@ -340,10 +342,6 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_CHECK_ME=y
 # CONFIG_USE_ME_CLEANER is not set
 # CONFIG_HAVE_EC_BIN is not set
-
-#
-# Verified Boot (vboot)
-#
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
@@ -409,6 +407,7 @@ 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_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
@@ -440,6 +439,7 @@ 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_SOFTWARE_I2C is not set

 #
@@ -450,8 +450,15 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # 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_CACHE_MRC_SETTINGS=y
+CONFIG_MRC_SETTINGS_CACHE_BASE=0xfffe0000
+CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
+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_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
@@ -484,17 +491,17 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
 # CONFIG_USBDEBUG_DONGLE_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_RX6110SA_USE_SMBUS 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
@@ -506,6 +513,7 @@ CONFIG_INTEL_INT15=y
 # 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
@@ -513,6 +521,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM 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
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -520,8 +529,17 @@ CONFIG_DRIVERS_MC146818=y
 # 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
@@ -529,7 +547,6 @@ CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
 CONFIG_RTC=y
 # CONFIG_TPM is not set
 # CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
-CONFIG_STACK_SIZE=0x1000

 #
 # Console
@@ -580,7 +597,6 @@ 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="Librem 13"

 #
 # Payload
@@ -595,10 +611,9 @@ CONFIG_PAYLOAD_SEABIOS=y
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
-# CONFIG_SEABIOS_STABLE is not set
+CONFIG_SEABIOS_STABLE=y
 # CONFIG_SEABIOS_MASTER is not set
-CONFIG_SEABIOS_REVISION=y
-CONFIG_SEABIOS_REVISION_ID="5c1a2c75951c4a59f1bf2d3c82ca7447244513ad"
+# CONFIG_SEABIOS_REVISION is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 CONFIG_SEABIOS_BOOTORDER_FILE="bootorder.txt"
 CONFIG_SEABIOS_DEBUG_LEVEL=-1
@@ -647,13 +662,8 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_REG_SCRIPT=y
 # CONFIG_CREATE_BOARD_CHECKLIST is not set
 # CONFIG_MAKE_CHECKLIST_PUBLIC is not set
-# CONFIG_RAMSTAGE_ADA is not set
-# CONFIG_RAMSTAGE_LIBHWBASE is not set
-CONFIG_HWBASE_DYNAMIC_MMIO=y
 # 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_BOARD_ID_AUTO is not set
-# CONFIG_BOARD_ID_MANUAL is not set
 CONFIG_BOOTBLOCK_CUSTOM=y
--- a/configs/config.librem13v2
+++ b/configs/config.librem13v2
@@ -7,7 +7,7 @@
 # General setup
 #
 CONFIG_COREBOOT_BUILD=y
-CONFIG_LOCALVERSION="4.7-Purism-1"
+CONFIG_LOCALVERSION="4.7-Purism-2"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set

--- a/configs/config.librem15v3
+++ b/configs/config.librem15v3
@@ -7,7 +7,7 @@
 # General setup
 #
 CONFIG_COREBOOT_BUILD=y
-CONFIG_LOCALVERSION="4.7-Purism-1"
+CONFIG_LOCALVERSION="4.7-Purism-2"
 CONFIG_CBFS_PREFIX="fallback"
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set