configs/coreboot-librem*: update defconfigs

Update librem coreboot defconfigs after rebasing on coreboot 4.10-pre Test: build/boot Librem 13v2 and verify Heads functionality working Signed-off-by: Matt DeVillier <[email protected]>
linuxboot · Nov 21, 2019 · 7a1a95f · 7a1a95f
1 parent 5a81d16
commit 7a1a95f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 64 deletions.
diff --git a/config/coreboot-librem13v2.config b/config/coreboot-librem13v2.config
@@ -1,29 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
+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=on quiet loglevel=3"

diff --git a/config/coreboot-librem13v4.config b/config/coreboot-librem13v4.config
@@ -1,29 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
+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=on quiet loglevel=3"

diff --git a/config/coreboot-librem15v3.config b/config/coreboot-librem15v3.config
@@ -1,29 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
+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=on quiet loglevel=3"

diff --git a/config/coreboot-librem15v4.config b/config/coreboot-librem15v4.config
@@ -1,29 +1,23 @@
-CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
+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=on quiet loglevel=3"