(WIP) update coreboot

Makefile

@@ -233,8 +233,7 @@ define define_module =
     # that the files are all present. No signature hashes are checked in
     # this case, since we don't have a stable version to compare against.
     $(build)/$($1_base_dir)/.canary:
-	git clone $($1_repo) "$(build)/$($1_base_dir)"
-	cd $(build)/$($1_base_dir) && git submodule update --init --checkout
+	git clone --recurse-submodules $($1_repo) "$(build)/$($1_base_dir)"
 	if [ -r patches/$1.patch ]; then \
 		( cd $(build)/$($1_base_dir) ; patch -p1 ) \
 			< patches/$1.patch \

config/coreboot-librem13v2.config

@@ -1,30 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
-CONFIG_ANY_TOOLCHAIN=y
+CONFIG_LOCALVERSION="4.10-PureBoot-beta"
 CONFIG_USE_BLOBS=y
 CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_PURISM=y
-CONFIG_CBFS_SIZE=0xe00000
-CONFIG_MAINBOARD_SERIAL_NUMBER="Unknown Serial Number"
-CONFIG_HAVE_IFD_BIN=y
-CONFIG_HAVE_ME_BIN=y
-# CONFIG_POST_IO is not set
-# CONFIG_POST_DEVICE is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="System Serial Number"
+CONFIG_INTEL_GMA_VBT_FILE="3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin"
 CONFIG_IFD_BIN_PATH="../../blobs/librem_skl/descriptor.bin"
 CONFIG_ME_BIN_PATH="../../blobs/librem_skl/me.bin"
+CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
-CONFIG_FSP_M_FILE="../../blobs/librem_skl/fspm.bin"
-CONFIG_FSP_S_FILE="../../blobs/librem_skl/fsps.bin"
 CONFIG_BOARD_PURISM_LIBREM13_V2=y
-# CONFIG_NO_POST is not set
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_CPU_UCODE_BINARIES="../../blobs/librem_skl/cpu_microcode_blob.bin"
+CONFIG_HAVE_ME_BIN=y
 CONFIG_NO_GFX_INIT=y
-CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE=y
-CONFIG_INTEL_GMA_VBT_FILE="../../blobs/librem_skl/vbt.bin"
-CONFIG_DISPLAY_FSP_CALLS_AND_STATUS=y
-CONFIG_FSP_M_XIP=y
+CONFIG_INTEL_GMA_ADD_VBT=y
+CONFIG_FSP_USE_REPO=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_USER_TPM1=y
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"

config/coreboot-librem13v4.config

@@ -1,30 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
-CONFIG_ANY_TOOLCHAIN=y
+CONFIG_LOCALVERSION="4.10-PureBoot-beta"
 CONFIG_USE_BLOBS=y
 CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_PURISM=y
-CONFIG_CBFS_SIZE=0xe00000
-CONFIG_MAINBOARD_SERIAL_NUMBER="Unknown Serial Number"
-CONFIG_HAVE_IFD_BIN=y
-CONFIG_HAVE_ME_BIN=y
-# CONFIG_POST_IO is not set
-# CONFIG_POST_DEVICE is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="System Serial Number"
+CONFIG_INTEL_GMA_VBT_FILE="3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin"
 CONFIG_IFD_BIN_PATH="../../blobs/librem_kbl/descriptor.bin"
 CONFIG_ME_BIN_PATH="../../blobs/librem_kbl/me.bin"
+CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
-CONFIG_FSP_M_FILE="../../blobs/librem_kbl/fspm.bin"
-CONFIG_FSP_S_FILE="../../blobs/librem_kbl/fsps.bin"
 CONFIG_BOARD_PURISM_LIBREM13_V4=y
-# CONFIG_NO_POST is not set
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_CPU_UCODE_BINARIES="../../blobs/librem_kbl/cpu_microcode_blob.bin"
+CONFIG_HAVE_ME_BIN=y
 CONFIG_NO_GFX_INIT=y
-CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE=y
-CONFIG_INTEL_GMA_VBT_FILE="../../blobs/librem_kbl/vbt.bin"
-CONFIG_DISPLAY_FSP_CALLS_AND_STATUS=y
-CONFIG_FSP_M_XIP=y
+CONFIG_INTEL_GMA_ADD_VBT=y
+CONFIG_FSP_USE_REPO=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_USER_TPM1=y
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem13v4/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"

config/coreboot-librem15v3.config

@@ -1,30 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
-CONFIG_ANY_TOOLCHAIN=y
+CONFIG_LOCALVERSION="4.10-PureBoot-beta"
 CONFIG_USE_BLOBS=y
 CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_PURISM=y
-CONFIG_CBFS_SIZE=0xe00000
-CONFIG_MAINBOARD_SERIAL_NUMBER="Unknown Serial Number"
-CONFIG_HAVE_IFD_BIN=y
-CONFIG_HAVE_ME_BIN=y
-# CONFIG_POST_IO is not set
-# CONFIG_POST_DEVICE is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="System Serial Number"
+CONFIG_INTEL_GMA_VBT_FILE="3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin"
 CONFIG_IFD_BIN_PATH="../../blobs/librem_skl/descriptor.bin"
 CONFIG_ME_BIN_PATH="../../blobs/librem_skl/me.bin"
+CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
-CONFIG_FSP_M_FILE="../../blobs/librem_skl/fspm.bin"
-CONFIG_FSP_S_FILE="../../blobs/librem_skl/fsps.bin"
 CONFIG_BOARD_PURISM_LIBREM15_V3=y
-# CONFIG_NO_POST is not set
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_CPU_UCODE_BINARIES="../../blobs/librem_skl/cpu_microcode_blob.bin"
+CONFIG_HAVE_ME_BIN=y
 CONFIG_NO_GFX_INIT=y
-CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE=y
-CONFIG_INTEL_GMA_VBT_FILE="../../blobs/librem_skl/vbt.bin"
-CONFIG_DISPLAY_FSP_CALLS_AND_STATUS=y
-CONFIG_FSP_M_XIP=y
+CONFIG_INTEL_GMA_ADD_VBT=y
+CONFIG_FSP_USE_REPO=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_USER_TPM1=y
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem15v3/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"

config/coreboot-librem15v4.config

@@ -1,30 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
-CONFIG_ANY_TOOLCHAIN=y
+CONFIG_LOCALVERSION="4.10-PureBoot-beta"
 CONFIG_USE_BLOBS=y
 CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_PURISM=y
-CONFIG_CBFS_SIZE=0xe00000
-CONFIG_MAINBOARD_SERIAL_NUMBER="Unknown Serial Number"
-CONFIG_HAVE_IFD_BIN=y
-CONFIG_HAVE_ME_BIN=y
-# CONFIG_POST_IO is not set
-# CONFIG_POST_DEVICE is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="System Serial Number"
+CONFIG_INTEL_GMA_VBT_FILE="3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin"
 CONFIG_IFD_BIN_PATH="../../blobs/librem_kbl/descriptor.bin"
 CONFIG_ME_BIN_PATH="../../blobs/librem_kbl/me.bin"
+CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
-CONFIG_FSP_M_FILE="../../blobs/librem_kbl/fspm.bin"
-CONFIG_FSP_S_FILE="../../blobs/librem_kbl/fsps.bin"
 CONFIG_BOARD_PURISM_LIBREM15_V4=y
-# CONFIG_NO_POST is not set
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_CPU_UCODE_BINARIES="../../blobs/librem_kbl/cpu_microcode_blob.bin"
+CONFIG_HAVE_ME_BIN=y
 CONFIG_NO_GFX_INIT=y
-CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE=y
-CONFIG_INTEL_GMA_VBT_FILE="../../blobs/librem_kbl/vbt.bin"
-CONFIG_DISPLAY_FSP_CALLS_AND_STATUS=y
-CONFIG_FSP_M_XIP=y
+CONFIG_INTEL_GMA_ADD_VBT=y
+CONFIG_FSP_USE_REPO=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_USER_TPM1=y
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/librem15v4/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"

config/coreboot-x230.config

@@ -11,15 +11,12 @@ CONFIG_CBFS_SIZE=0x700000
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_BOARD_LENOVO_X230=y
 CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
 CONFIG_UART_PCI_ADDR=0
 CONFIG_NO_GFX_INIT=y
 # CONFIG_CONSOLE_SERIAL is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/x230/bzImage"
-CONFIG_PAYLOAD_OPTIONS=""
-# CONFIG_PXE is not set
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
 CONFIG_LINUX_INITRD="../../build/x230/initrd.cpio.xz"
-CONFIG_DEBUG_SMM_RELOCATION=y

modules/coreboot

@@ -1,13 +1,13 @@
 modules-$(CONFIG_COREBOOT) += coreboot
 
-#coreboot_version := git
-#coreboot_repo := https://github.com/osresearch/coreboot
-coreboot_version := 4.8.1
+# coreboot_version := git
+# coreboot_repo := https://review.coreboot.org/coreboot.git
+coreboot_version := 4.11
 coreboot_base_dir := coreboot-$(coreboot_version)
 coreboot_dir := $(coreboot_base_dir)/$(BOARD)
 coreboot_tar := coreboot-$(coreboot_version).tar.xz
 coreboot_url := https://www.coreboot.org/releases/$(coreboot_tar)
-coreboot_hash := f0ddf4db0628c1fe1e8348c40084d9cbeb5771400c963fd419cda3995b69ad23
+coreboot_hash := 97fd859b4c39a25534fe33c30eb86e54a233952e08a024c55858d11598a8ad87
 
 # coreboot builds are specialized on a per-target basis.
 # The builds are done in a per-target subdirectory
@@ -96,7 +96,7 @@ coreboot-blobs_tar := coreboot-blobs-$(coreboot-blobs_version).tar.xz
 coreboot-blobs_tar_opt := --strip 3
 coreboot-blobs_dir := coreboot-$(coreboot-blobs_version)/3rdparty/blobs
 coreboot-blobs_url := https://www.coreboot.org/releases/$(coreboot-blobs_tar)
-coreboot-blobs_hash := 18aa509ae3af005a05d7b1e0b0246dc640249c14fc828f5144b6fd20bb10e295
+coreboot-blobs_hash := aa7855c5bd385b3360dadc043ea6bc93f564e6e4840d9b3ee5b9e696bbd055db
 
 ## there is nothing to build for the blobs, this should be
 ## made easier to make happen