Skip to content

Commit

Permalink
configs/coreboot-*: Update defconfigs for coreboot 4.12
Browse files Browse the repository at this point in the history 
- use coreboot's measured boot
- drop unnecessary non-default parameters
- increase CBFS size on x220/x230/t430
- unify version string

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
  • Loading branch information
@MrChromebox
MrChromebox committed May 14, 2020
1 parent 902a97f commit 1e57b1f
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 159 deletions.
29 changes: 7 additions & 22 deletions config/coreboot-librem13v2.config
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,16 @@
CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
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_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../blobs/librem_skl/descriptor.bin"
CONFIG_ME_BIN_PATH="../../blobs/librem_skl/me.bin"
CONFIG_ADD_FSP_BINARIES=y
CONFIG_FSP_M_FILE="../../blobs/librem_skl/fspm.bin"
CONFIG_FSP_S_FILE="../../blobs/librem_skl/fsps.bin"
CONFIG_HAVE_IFD_BIN=y
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_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_DRIVERS_INTEL_WIFI is not set
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_HAVE_ME_BIN=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
29 changes: 7 additions & 22 deletions config/coreboot-librem13v4.config
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,16 @@
CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
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_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../blobs/librem_kbl/descriptor.bin"
CONFIG_ME_BIN_PATH="../../blobs/librem_kbl/me.bin"
CONFIG_ADD_FSP_BINARIES=y
CONFIG_FSP_M_FILE="../../blobs/librem_kbl/fspm.bin"
CONFIG_FSP_S_FILE="../../blobs/librem_kbl/fsps.bin"
CONFIG_HAVE_IFD_BIN=y
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_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_DRIVERS_INTEL_WIFI is not set
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_HAVE_ME_BIN=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/librem13v4/bzImage"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
CONFIG_LINUX_INITRD="../../build/librem13v4/initrd.cpio.xz"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
34 changes: 10 additions & 24 deletions config/coreboot-librem15v3.config
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
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_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../blobs/librem_skl/descriptor.bin"
CONFIG_ME_BIN_PATH="../../blobs/librem_skl/me.bin"
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_HAVE_IFD_BIN=y
CONFIG_BOARD_PURISM_LIBREM13_V2=y
CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
CONFIG_CPU_UCODE_BINARIES="../../blobs/librem_skl/cpu_microcode_blob.bin"
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_DRIVERS_INTEL_WIFI is not set
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_HAVE_ME_BIN=y
CONFIG_BOARD_PURISM_LIBREM15_V3=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/librem15v3/bzImage"
CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage"
CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
CONFIG_LINUX_INITRD="../../build/librem15v3/initrd.cpio.xz"
29 changes: 7 additions & 22 deletions config/coreboot-librem15v4.config
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,16 @@
CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
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_DRIVERS_INTEL_WIFI is not set
CONFIG_IFD_BIN_PATH="../../blobs/librem_kbl/descriptor.bin"
CONFIG_ME_BIN_PATH="../../blobs/librem_kbl/me.bin"
CONFIG_ADD_FSP_BINARIES=y
CONFIG_FSP_M_FILE="../../blobs/librem_kbl/fspm.bin"
CONFIG_FSP_S_FILE="../../blobs/librem_kbl/fsps.bin"
CONFIG_HAVE_IFD_BIN=y
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_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_DRIVERS_INTEL_WIFI is not set
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_HAVE_ME_BIN=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/librem15v4/bzImage"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
CONFIG_LINUX_INITRD="../../build/librem15v4/initrd.cpio.xz"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
6 changes: 2 additions & 4 deletions config/coreboot-qemu.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ CONFIG_ANY_TOOLCHAIN=y
CONFIG_CBFS_SIZE=0x700000
# CONFIG_POST_IO is not set
CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
# CONFIG_CONSOLE_SERIAL is not set
# CONFIG_POST_DEVICE is not set
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_COREBOOT_ROMSIZE_KB_8192=y
CONFIG_PCIEXP_ASPM=y
CONFIG_PCIEXP_COMMON_CLOCK=y
CONFIG_UART_PCI_ADDR=0
CONFIG_CPU_MICROCODE_CBFS_GENERATE=y
# CONFIG_CONSOLE_SERIAL is not set
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_LINUX_COMMAND_LINE="debug console=ttyS0 vga=786"
CONFIG_PAYLOAD_FILE="../../build/qemu-coreboot/bzImage"
CONFIG_LINUX_INITRD="../../build/qemu-coreboot/initrd.cpio.xz"
CONFIG_LINUX_COMMAND_LINE="debug console=ttyS0 vga=786"
26 changes: 9 additions & 17 deletions config/coreboot-t420.config
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
CONFIG_LOCALVERSION="heads"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
# CONFIG_INCLUDE_CONFIG_FILE is not set
# CONFIG_COLLECT_TIMESTAMPS is not set
CONFIG_USE_BLOBS=y
CONFIG_MEASURED_BOOT=y
CONFIG_VENDOR_LENOVO=y
CONFIG_CBFS_SIZE=0x700000
CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_HAVE_IFD_BIN=y
CONFIG_HAVE_ME_BIN=y
CONFIG_HAVE_GBE_BIN=y
CONFIG_NO_POST=y
CONFIG_CBFS_SIZE=0x720000
CONFIG_IFD_BIN_PATH="../../blobs/t420/ifd.bin"
CONFIG_ME_BIN_PATH="../../blobs/t420/me.bin"
CONFIG_BOARD_LENOVO_T420=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_NO_POST=y
CONFIG_GBE_BIN_PATH="../../blobs/t420/gbe.bin"
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
CONFIG_HAVE_IFD_BIN=y
CONFIG_BOARD_LENOVO_T420=y
CONFIG_HAVE_ME_BIN=y
CONFIG_HAVE_GBE_BIN=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/t420/bzImage"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
CONFIG_LINUX_INITRD="../../build/t420/initrd.cpio.xz"
CONFIG_DEBUG_SMM_RELOCATION=y
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
26 changes: 9 additions & 17 deletions config/coreboot-x220.config
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
CONFIG_LOCALVERSION="heads"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
# CONFIG_INCLUDE_CONFIG_FILE is not set
# CONFIG_COLLECT_TIMESTAMPS is not set
CONFIG_USE_BLOBS=y
CONFIG_MEASURED_BOOT=y
CONFIG_VENDOR_LENOVO=y
CONFIG_CBFS_SIZE=0x700000
CONFIG_ONBOARD_VGA_IS_PRIMARY=y
CONFIG_HAVE_IFD_BIN=y
CONFIG_HAVE_ME_BIN=y
CONFIG_HAVE_GBE_BIN=y
CONFIG_NO_POST=y
CONFIG_CBFS_SIZE=0x720000
CONFIG_IFD_BIN_PATH="../../blobs/x220/ifd.bin"
CONFIG_ME_BIN_PATH="../../blobs/x220/me.bin"
CONFIG_BOARD_LENOVO_X220=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_NO_POST=y
CONFIG_GBE_BIN_PATH="../../blobs/x220/gbe.bin"
#CONFIG_DEBUG_TPM=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
CONFIG_HAVE_IFD_BIN=y
CONFIG_BOARD_LENOVO_X220=y
CONFIG_HAVE_ME_BIN=y
CONFIG_HAVE_GBE_BIN=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/x220/bzImage"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
CONFIG_LINUX_INITRD="../../build/x220/initrd.cpio.xz"
CONFIG_DEBUG_SMM_RELOCATION=y
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
15 changes: 3 additions & 12 deletions config/coreboot-x230-flash.config
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
CONFIG_LOCALVERSION="heads"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
# CONFIG_INCLUDE_CONFIG_FILE is not set
# CONFIG_COLLECT_TIMESTAMPS is not set
CONFIG_USE_BLOBS=y
CONFIG_MEASURED_BOOT=y
CONFIG_VENDOR_LENOVO=y
CONFIG_NO_POST=y
CONFIG_CBFS_SIZE=0x400000
# CONFIG_POST_DEVICE is not set
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_BOARD_LENOVO_X230=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
CONFIG_UART_PCI_ADDR=0
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/x230-flash/bzImage"
CONFIG_LINUX_INITRD="../../build/x230-flash/initrd.cpio.xz"
CONFIG_DEBUG_SMM_RELOCATION=y
24 changes: 5 additions & 19 deletions config/coreboot-x230.config
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
CONFIG_LOCALVERSION="heads"
CONFIG_LOCALVERSION="-heads"
CONFIG_ANY_TOOLCHAIN=y
# CONFIG_INCLUDE_CONFIG_FILE is not set
# CONFIG_COLLECT_TIMESTAMPS is not set
CONFIG_USE_BLOBS=y
CONFIG_MEASURED_BOOT=y
CONFIG_VENDOR_LENOVO=y
CONFIG_CBFS_SIZE=0x700000
# CONFIG_POST_IO is not set
# CONFIG_POST_DEVICE is not set
CONFIG_DRIVERS_UART_8250IO=y
CONFIG_NO_POST=y
CONFIG_CBFS_SIZE=0x720000
CONFIG_BOARD_LENOVO_X230=y
CONFIG_DRIVERS_PS2_KEYBOARD=y
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_TPM_MEASURED_BOOT=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
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"

0 comments on commit 1e57b1f

Please sign in to comment.